Merge pull request #2064 from SvenDowideit/fix-integration-tests

Fix integration tests

Makefile

@@ -49,7 +49,7 @@ release-build:
 itest:
 	mkdir -p dist
 	./.dapper integration-test 2>&1 | tee dist/itest.log
-	grep FAIL dist/itest.log || true
+	grep --binary-files=text FAIL dist/itest.log || true
 
 qcows:
 	cp dist/artifacts/rancheros.iso scripts/images/openstack/

tests/assets/test_25/cloud-config.yml

@@ -2,6 +2,6 @@
 rancher:
   console: debian
   docker:
-    engine: docker-17.06.0-ce
+    engine: docker-17.06.1-ce
 ssh_authorized_keys:
   - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC85w9stZyiLQp/DkVO6fqwiShYcj1ClKdtCqgHtf+PLpJkFReSFu8y21y+ev09gsSMRRrjF7yt0pUHV6zncQhVeqsZtgc5WbELY2DOYUGmRn/CCvPbXovoBrQjSorqlBmpuPwsStYLr92Xn+VVsMNSUIegHY22DphGbDKG85vrKB8HxUxGIDxFBds/uE8FhSy+xsoyT/jUZDK6pgq2HnGl6D81ViIlKecpOpWlW3B+fea99ADNyZNVvDzbHE5pcI3VRw8u59WmpWOUgT6qacNVACl8GqpBvQk8sw7O/X9DSZHCKafeD9G5k+GYbAUz92fKWrx/lOXfUXPS3+c8dRIF

tests/common_test.go

@@ -50,6 +50,7 @@ func (s *QemuSuite) TearDownTest(c *C) {
 	if s.qemuCmd != nil {
 		s.Stop(c)
 	}
+	time.Sleep(time.Second)
 }
 
 // RunQemuWith requires user to specify all the `scripts/run` arguments
@@ -252,7 +253,7 @@ func (s *QemuSuite) Stop(c *C) {
 	c.Assert(s.qemuCmd.Process.Kill(), IsNil)
 	fmt.Printf("%s: stopping qemu 3\n", c.TestName())
 	s.qemuCmd.Process.Wait()
-	//time.Sleep(time.Millisecond * 1000)
+	time.Sleep(time.Second)
 	s.qemuCmd = nil
 	fmt.Printf("--- %s: qemu stopped", c.TestName())
 }

tests/custom_docker_test.go

@@ -43,8 +43,8 @@ func (s *QemuSuite) TestCustomDockerInPersistentConsole(c *C) {
 set -ex
 
 apt-get --version
-docker version | grep 17.06.0-ce
-sudo ros engine list | grep 17.06.0-ce | grep current
+docker version | grep 17.06.1-ce
+sudo ros engine list | grep 17.06.1-ce | grep current
 docker run -d --restart=always nginx
 docker ps | grep nginx`)