sanity test fixes

shaleman · shaleman · commit 197fd3157ae0 · 2016-07-26T06:52:37.000-07:00
diff --git a/Vagrantfile b/Vagrantfile
@@ -80,6 +80,9 @@ provision_common_always = <<SCRIPT
 # Drop cache to workaround vboxsf problem
 echo 3 > /proc/sys/vm/drop_caches
 
+# start docker daemon
+systemctl start docker
+
 # Start OVS if required
 systemctl start openvswitch
 
diff --git a/systemtests/trigger_test.go b/systemtests/trigger_test.go
@@ -124,7 +124,7 @@ func (s *systemtestSuite) TestTriggerNetpluginDisconnect(c *C) {
 }
 
 func (s *systemtestSuite) TestTriggerNodeReload(c *C) {
-	if os.Getenv("CONTIV_DOCKER_VERSION") != "1.11.1" {
+	if os.Getenv("CONTIV_DOCKER_VERSION") == "1.10.3" {
 		c.Skip("Skipping node reload test on older docker version")
 	}
 	network := &client.Network{
diff --git a/vendor/gopkg.in/check.v1/helpers.go b/vendor/gopkg.in/check.v1/helpers.go

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ func (s systemtestSuite) TestTriggerNetpluginDisconnect(c C) {`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`func (s systemtestSuite) TestTriggerNodeReload(c C) {`
`127`		`- if os.Getenv("CONTIV_DOCKER_VERSION") != "1.11.1" {`
	`127`	`+ if os.Getenv("CONTIV_DOCKER_VERSION") == "1.10.3" {`
`128`	`128`	`c.Skip("Skipping node reload test on older docker version")`
`129`	`129`	`}`
`130`	`130`	`network := &client.Network{`