Merge lp:~fgimenez/snappy/fan-test-fixes into lp:~snappy-dev/snappy/snappy-moved-to-github

[Federico Gimenez]

Wait for docker.sock instead of service active on docker setup

Wait for docker.sock instead of service active on docker setup

[lp:~fgimenez/snappy/fan-test-fixes]

778. By Federico Gimenez on 2015-10-16

wait for service too

[Leo Arias (elopio)]

Please add a check.Commentf message to the Assertions.

review: Needs Fixing

[lp:~fgimenez/snappy/fan-test-fixes]

779. By Federico Gimenez on 2015-10-20

merged trunk

780. By Federico Gimenez on 2015-10-20

Added messages to assertions

[Federico Gimenez (fgimenez)]

Ok done, thanks!

[lp:~fgimenez/snappy/fan-test-fixes]

781. By Federico Gimenez on 2015-10-20

merged trunk

[Leo Arias (elopio)]

review: Approve

=== modified file '_integration-tests/tests/ubuntuFan_test.go'
--- _integration-tests/tests/ubuntuFan_test.go	2015-10-15 01:34:46 +0000
+++ _integration-tests/tests/ubuntuFan_test.go	2015-10-20 08:43:58 +0000
@@ -179,8 +179,11 @@
 	cli.ExecCommand(c, "sudo", "systemctl", "restart", dockerService)
 
 	// we need to wait until the socket is ready, an active systemctl status is not enough
-	err := wait.ForCommand(c, `(?ms).*docker\.sock\s.*`, "ls", "/run")
-	c.Assert(err, check.IsNil)
+	err := wait.ForActiveService(c, dockerService)
+	c.Assert(err, check.IsNil, check.Commentf("Expected nil error, got %s", err))
+
+	err = wait.ForCommand(c, `(?ms).*docker\.sock\s.*`, "ls", "/run")
+	c.Assert(err, check.IsNil, check.Commentf("Expected nil error, got %s", err))
 }
 
 func (s *fanTestSuite) fanName() string {
@@ -200,6 +203,9 @@
 	err := wait.ForActiveService(c, dockerService)
 	c.Assert(err, check.IsNil, check.Commentf("Error waiting for service: %s", err))
 
+	err = wait.ForCommand(c, `(?ms).*docker\.sock\s.*`, "ls", "/run")
+	c.Assert(err, check.IsNil, check.Commentf("Expected nil error, got %s", err))
+
 	cli.ExecCommand(c, "docker", "pull", baseContainer)
 }