From 2ae22a66fecf5fc433c1028b8020dbb9083a0e88 Mon Sep 17 00:00:00 2001
From: Josh Curl <josh@curl.me>
Date: Fri, 21 Oct 2016 20:34:30 -0700
Subject: [PATCH] Always assert RunQemu is successful

---
 tests/bad_state_test.go               |  6 ++----
 tests/cloud_config_hostname_test.go   |  3 +--
 tests/common_test.go                  | 13 ++++++-------
 tests/consoles_test.go                |  6 ++----
 tests/custom_docker_test.go           |  6 ++----
 tests/dhcp_hostname_test.go           |  3 +--
 tests/environment_test.go             |  3 +--
 tests/http_proxy_test.go              |  3 +--
 tests/kernel_headers_test.go          |  3 +--
 tests/lenient_service_parsing_test.go |  3 +--
 tests/misc_test.go                    |  3 +--
 tests/mounts_test.go                  |  3 +--
 tests/network_from_url_test.go        |  3 +--
 tests/network_on_boot_test.go         |  3 +--
 tests/network_test.go                 |  3 +--
 tests/nonexistent_state_test.go       |  4 +---
 tests/oem_test.go                     |  3 +--
 tests/preload_test.go                 |  3 +--
 tests/ros_config_test.go              |  3 +--
 tests/shared_mount_test.go            |  4 +---
 tests/ssh_key_merge_test.go           |  4 +---
 tests/start_commands_test.go          |  3 +--
 tests/subdir_test.go                  |  4 +---
 tests/swap_test.go                    |  3 +--
 tests/sysctl_test.go                  |  3 +--
 tests/tls_test.go                     |  4 +---
 tests/upgrade_test.go                 |  3 +--
 tests/write_files_test.go             |  3 +--
 28 files changed, 36 insertions(+), 72 deletions(-)

diff --git a/tests/bad_state_test.go b/tests/bad_state_test.go
index 413783a91..29530160e 100644
--- a/tests/bad_state_test.go
+++ b/tests/bad_state_test.go
@@ -3,13 +3,11 @@ package integration
 import . "gopkg.in/check.v1"
 
 func (s *QemuSuite) TestBadState(c *C) {
-	err := s.RunQemu("--no-format", "--append", "rancher.state.dev=LABEL=BAD_STATE")
-	c.Assert(err, IsNil)
+	s.RunQemu(c, "--no-format", "--append", "rancher.state.dev=LABEL=BAD_STATE")
 	s.CheckCall(c, "mount | grep /var/lib/docker | grep rootfs")
 }
 
 func (s *QemuSuite) TestBadStateWithWait(c *C) {
-	err := s.RunQemu("--no-format", "--append", "rancher.state.dev=LABEL=BAD_STATE", "--append", "rancher.state.wait")
-	c.Assert(err, IsNil)
+	s.RunQemu(c, "--no-format", "--append", "rancher.state.dev=LABEL=BAD_STATE", "--append", "rancher.state.wait")
 	s.CheckCall(c, "mount | grep /var/lib/docker | grep rootfs")
 }
diff --git a/tests/cloud_config_hostname_test.go b/tests/cloud_config_hostname_test.go
index 5dee29c53..e22bc2899 100644
--- a/tests/cloud_config_hostname_test.go
+++ b/tests/cloud_config_hostname_test.go
@@ -3,8 +3,7 @@ package integration
 import . "gopkg.in/check.v1"
 
 func (s *QemuSuite) TestCloudConfigHostname(c *C) {
-	err := s.RunQemu("--cloud-config", "./tests/assets/test_13/cloud-config.yml")
-	c.Assert(err, IsNil)
+	s.RunQemu(c, "--cloud-config", "./tests/assets/test_13/cloud-config.yml")
 
 	s.CheckCall(c, "hostname | grep rancher-test")
 	s.CheckCall(c, "cat /etc/hosts | grep rancher-test")
diff --git a/tests/common_test.go b/tests/common_test.go
index 10a2b556a..b58c34044 100644
--- a/tests/common_test.go
+++ b/tests/common_test.go
@@ -31,9 +31,8 @@ var (
 		"arm":   "armhfbuild/nginx",
 		"arm64": "armhfbuild/nginx",
 	}[runtime.GOARCH]
-	DockerUrl = "https://experimental.docker.com/builds/Linux/x86_64/docker-1.10.0-dev"
-	Version   = os.Getenv("VERSION")
-	Suffix    = os.Getenv("SUFFIX")
+	Version = os.Getenv("VERSION")
+	Suffix  = os.Getenv("SUFFIX")
 )
 
 type QemuSuite struct {
@@ -47,7 +46,7 @@ func (s *QemuSuite) TearDownTest(c *C) {
 	time.Sleep(time.Millisecond * 1000)
 }
 
-func (s *QemuSuite) RunQemu(additionalArgs ...string) error {
+func (s *QemuSuite) RunQemu(c *C, additionalArgs ...string) {
 	runArgs := []string{
 		"--qemu",
 		"--no-rebuild",
@@ -56,10 +55,10 @@ func (s *QemuSuite) RunQemu(additionalArgs ...string) error {
 	}
 	runArgs = append(runArgs, additionalArgs...)
 
-	return s.runQemu(runArgs...)
+	c.Assert(s.runQemu(runArgs...), IsNil)
 }
 
-func (s *QemuSuite) RunQemuInstalled(additionalArgs ...string) error {
+func (s *QemuSuite) RunQemuInstalled(c *C, additionalArgs ...string) {
 	runArgs := []string{
 		"--qemu",
 		"--no-rebuild",
@@ -68,7 +67,7 @@ func (s *QemuSuite) RunQemuInstalled(additionalArgs ...string) error {
 	}
 	runArgs = append(runArgs, additionalArgs...)
 
-	return s.runQemu(runArgs...)
+	c.Assert(s.runQemu(runArgs...), IsNil)
 }
 
 func (s *QemuSuite) runQemu(args ...string) error {
diff --git a/tests/consoles_test.go b/tests/consoles_test.go
index b68964158..4b0b2123a 100644
--- a/tests/consoles_test.go
+++ b/tests/consoles_test.go
@@ -3,8 +3,7 @@ package integration
 import . "gopkg.in/check.v1"
 
 func (s *QemuSuite) TestCloudConfigConsole(c *C) {
-	err := s.RunQemu("--cloud-config", "./tests/assets/test_03/cloud-config.yml")
-	c.Assert(err, IsNil)
+	s.RunQemu(c, "--cloud-config", "./tests/assets/test_03/cloud-config.yml")
 
 	s.CheckCall(c, "apt-get --version")
 	s.CheckCall(c, `
@@ -13,8 +12,7 @@ sudo ros console list | grep debian | grep current`)
 }
 
 func (s *QemuSuite) TestConsoleCommand(c *C) {
-	err := s.RunQemu()
-	c.Assert(err, IsNil)
+	s.RunQemu(c)
 
 	s.CheckCall(c, `
 sudo ros console list | grep default | grep current
diff --git a/tests/custom_docker_test.go b/tests/custom_docker_test.go
index e4a68c701..d056794eb 100644
--- a/tests/custom_docker_test.go
+++ b/tests/custom_docker_test.go
@@ -3,8 +3,7 @@ package integration
 import . "gopkg.in/check.v1"
 
 func (s *QemuSuite) TestCustomDocker(c *C) {
-	err := s.RunQemu("--cloud-config", "./tests/assets/test_05/cloud-config.yml")
-	c.Assert(err, IsNil)
+	s.RunQemu(c, "--cloud-config", "./tests/assets/test_05/cloud-config.yml")
 
 	s.CheckCall(c, `
 set -ex
@@ -35,8 +34,7 @@ docker ps | grep nginx`)
 }
 
 func (s *QemuSuite) TestCustomDockerInPersistentConsole(c *C) {
-	err := s.RunQemu("--cloud-config", "./tests/assets/test_25/cloud-config.yml")
-	c.Assert(err, IsNil)
+	s.RunQemu(c, "--cloud-config", "./tests/assets/test_25/cloud-config.yml")
 
 	s.CheckCall(c, `
 set -ex
diff --git a/tests/dhcp_hostname_test.go b/tests/dhcp_hostname_test.go
index bf1dcc4c4..726dd9603 100644
--- a/tests/dhcp_hostname_test.go
+++ b/tests/dhcp_hostname_test.go
@@ -3,8 +3,7 @@ package integration
 import . "gopkg.in/check.v1"
 
 func (s *QemuSuite) TestDhcpHostname(c *C) {
-	err := s.RunQemu("--cloud-config", "./tests/assets/test_12/cloud-config.yml")
-	c.Assert(err, IsNil)
+	s.RunQemu(c, "--cloud-config", "./tests/assets/test_12/cloud-config.yml")
 
 	s.CheckCall(c, "hostname | grep rancher-dev")
 	s.CheckCall(c, "cat /etc/hosts | grep rancher-dev")
diff --git a/tests/environment_test.go b/tests/environment_test.go
index 79d3d8420..a1ddc24b4 100644
--- a/tests/environment_test.go
+++ b/tests/environment_test.go
@@ -3,8 +3,7 @@ package integration
 import . "gopkg.in/check.v1"
 
 func (s *QemuSuite) TestEnvironment(c *C) {
-	err := s.RunQemu("--cloud-config", "./tests/assets/test_11/cloud-config.yml")
-	c.Assert(err, IsNil)
+	s.RunQemu(c, "--cloud-config", "./tests/assets/test_11/cloud-config.yml")
 
 	s.CheckCall(c, "sudo system-docker inspect env | grep A=A")
 	s.CheckCall(c, "sudo system-docker inspect env | grep BB=BB")
diff --git a/tests/http_proxy_test.go b/tests/http_proxy_test.go
index 513c57ec3..9640699b1 100644
--- a/tests/http_proxy_test.go
+++ b/tests/http_proxy_test.go
@@ -3,8 +3,7 @@ package integration
 import . "gopkg.in/check.v1"
 
 func (s *QemuSuite) TestHttpProxy(c *C) {
-	err := s.RunQemu("--cloud-config", "./tests/assets/test_17/cloud-config.yml")
-	c.Assert(err, IsNil)
+	s.RunQemu(c, "--cloud-config", "./tests/assets/test_17/cloud-config.yml")
 
 	s.CheckCall(c, `
 set -x -e
diff --git a/tests/kernel_headers_test.go b/tests/kernel_headers_test.go
index cbba30f3b..ecbef5f3c 100644
--- a/tests/kernel_headers_test.go
+++ b/tests/kernel_headers_test.go
@@ -3,8 +3,7 @@ package integration
 import . "gopkg.in/check.v1"
 
 func (s *QemuSuite) TestKernelHeaders(c *C) {
-	err := s.RunQemu("--cloud-config", "./tests/assets/test_22/cloud-config.yml")
-	c.Assert(err, IsNil)
+	s.RunQemu(c, "--cloud-config", "./tests/assets/test_22/cloud-config.yml")
 
 	s.CheckCall(c, `
 sleep 15
diff --git a/tests/lenient_service_parsing_test.go b/tests/lenient_service_parsing_test.go
index d19521f53..2bd0cc9cc 100644
--- a/tests/lenient_service_parsing_test.go
+++ b/tests/lenient_service_parsing_test.go
@@ -3,8 +3,7 @@ package integration
 import . "gopkg.in/check.v1"
 
 func (s *QemuSuite) TestLenientServiceParsing(c *C) {
-	err := s.RunQemu("--cloud-config", "./tests/assets/test_19/cloud-config.yml")
-	c.Assert(err, IsNil)
+	s.RunQemu(c, "--cloud-config", "./tests/assets/test_19/cloud-config.yml")
 
 	s.CheckCall(c, `
 sleep 5
diff --git a/tests/misc_test.go b/tests/misc_test.go
index 3e912446f..cc6c9fe1f 100644
--- a/tests/misc_test.go
+++ b/tests/misc_test.go
@@ -3,8 +3,7 @@ package integration
 import . "gopkg.in/check.v1"
 
 func (s *QemuSuite) TestMisc(c *C) {
-	err := s.RunQemu("--cloud-config", "./tests/assets/test_01/cloud-config.yml")
-	c.Assert(err, IsNil)
+	s.RunQemu(c, "--cloud-config", "./tests/assets/test_01/cloud-config.yml")
 
 	s.CheckCall(c, "sudo ros env printenv FLANNEL_NETWORK | grep '10.244.0.0/16'")
 
diff --git a/tests/mounts_test.go b/tests/mounts_test.go
index ff92444db..6f9983c77 100644
--- a/tests/mounts_test.go
+++ b/tests/mounts_test.go
@@ -3,8 +3,7 @@ package integration
 import . "gopkg.in/check.v1"
 
 func (s *QemuSuite) TestMounts(c *C) {
-	err := s.RunQemu("--cloud-config", "./tests/assets/test_23/cloud-config.yml", "--second-drive")
-	c.Assert(err, IsNil)
+	s.RunQemu(c, "--cloud-config", "./tests/assets/test_23/cloud-config.yml", "--second-drive")
 
 	s.CheckCall(c, "cat /home/rancher/test | grep test")
 
diff --git a/tests/network_from_url_test.go b/tests/network_from_url_test.go
index fac7d018c..8c411c50e 100644
--- a/tests/network_from_url_test.go
+++ b/tests/network_from_url_test.go
@@ -8,8 +8,7 @@ func (s *QemuSuite) TestNetworkFromUrl(c *C) {
 	for i := 0; i < 7; i++ {
 		args = append(args, netArgs...)
 	}
-	err := s.RunQemu(args...)
-	c.Assert(err, IsNil)
+	s.RunQemu(c, args...)
 
 	s.CheckCall(c, `
 cat > test-merge << "SCRIPT"
diff --git a/tests/network_on_boot_test.go b/tests/network_on_boot_test.go
index 6ffc570de..f17dfe0a6 100644
--- a/tests/network_on_boot_test.go
+++ b/tests/network_on_boot_test.go
@@ -3,8 +3,7 @@ package integration
 import . "gopkg.in/check.v1"
 
 func (s *QemuSuite) TestNetworkOnBoot(c *C) {
-	err := s.RunQemu("--cloud-config", "./tests/assets/test_18/cloud-config.yml", "-net", "nic,vlan=1,model=virtio")
-	c.Assert(err, IsNil)
+	s.RunQemu(c, "--cloud-config", "./tests/assets/test_18/cloud-config.yml", "-net", "nic,vlan=1,model=virtio")
 
 	s.CheckCall(c, "apt-get --version")
 	s.CheckCall(c, "sudo system-docker images | grep tianon/true")
diff --git a/tests/network_test.go b/tests/network_test.go
index ba603473d..c54bd8133 100644
--- a/tests/network_test.go
+++ b/tests/network_test.go
@@ -8,8 +8,7 @@ func (s *QemuSuite) TestNetwork(c *C) {
 	for i := 0; i < 7; i++ {
 		args = append(args, netArgs...)
 	}
-	err := s.RunQemu(args...)
-	c.Assert(err, IsNil)
+	s.RunQemu(c, args...)
 
 	s.CheckCall(c, `
 cat > test-merge << "SCRIPT"
diff --git a/tests/nonexistent_state_test.go b/tests/nonexistent_state_test.go
index 4a306b4f0..9843f1bc4 100644
--- a/tests/nonexistent_state_test.go
+++ b/tests/nonexistent_state_test.go
@@ -3,8 +3,6 @@ package integration
 import . "gopkg.in/check.v1"
 
 func (s *QemuSuite) TestNonexistentState(c *C) {
-	err := s.RunQemu("--no-format", "--append", "rancher.state.dev=LABEL=NONEXISTENT")
-	c.Assert(err, IsNil)
-
+	s.RunQemu(c, "--no-format", "--append", "rancher.state.dev=LABEL=NONEXISTENT")
 	s.CheckCall(c, "sudo ros config get rancher.state.dev | grep LABEL=NONEXISTENT")
 }
diff --git a/tests/oem_test.go b/tests/oem_test.go
index 1095f390f..7b785bf00 100644
--- a/tests/oem_test.go
+++ b/tests/oem_test.go
@@ -3,8 +3,7 @@ package integration
 import . "gopkg.in/check.v1"
 
 func (s *QemuSuite) TestOem(c *C) {
-	err := s.RunQemu("--second-drive")
-	c.Assert(err, IsNil)
+	s.RunQemu(c, "--second-drive")
 
 	s.CheckCall(c, `
 set -x
diff --git a/tests/preload_test.go b/tests/preload_test.go
index 66a6714c7..5b533475a 100644
--- a/tests/preload_test.go
+++ b/tests/preload_test.go
@@ -5,8 +5,7 @@ import (
 )
 
 func (s *QemuSuite) TestPreload(c *C) {
-	err := s.RunQemu()
-	c.Assert(err, IsNil)
+	s.RunQemu(c)
 
 	s.CheckCall(c, `
 docker pull busybox
diff --git a/tests/ros_config_test.go b/tests/ros_config_test.go
index fb96ac8cb..92cb29746 100644
--- a/tests/ros_config_test.go
+++ b/tests/ros_config_test.go
@@ -3,8 +3,7 @@ package integration
 import . "gopkg.in/check.v1"
 
 func (s *QemuSuite) TestRosConfig(c *C) {
-	err := s.RunQemu("--cloud-config", "./tests/assets/test_14/cloud-config.yml")
-	c.Assert(err, IsNil)
+	s.RunQemu(c, "--cloud-config", "./tests/assets/test_14/cloud-config.yml")
 
 	s.CheckCall(c, `
 set -x -e
diff --git a/tests/shared_mount_test.go b/tests/shared_mount_test.go
index de70b588d..90428bc08 100644
--- a/tests/shared_mount_test.go
+++ b/tests/shared_mount_test.go
@@ -7,9 +7,7 @@ import (
 )
 
 func (s *QemuSuite) TestSharedMount(c *C) {
-	err := s.RunQemu()
-	c.Assert(err, IsNil)
-
+	s.RunQemu(c)
 	s.CheckCall(c, fmt.Sprintf(`
 set -x -e
 
diff --git a/tests/ssh_key_merge_test.go b/tests/ssh_key_merge_test.go
index 05ef929c0..e17e6b1c2 100644
--- a/tests/ssh_key_merge_test.go
+++ b/tests/ssh_key_merge_test.go
@@ -3,9 +3,7 @@ package integration
 import . "gopkg.in/check.v1"
 
 func (s *QemuSuite) TestSshKeyMerge(c *C) {
-	err := s.RunQemu()
-	c.Assert(err, IsNil)
-
+	s.RunQemu(c)
 	s.CheckCall(c, `
 cat > test-merge << "SCRIPT"
 set -x -e
diff --git a/tests/start_commands_test.go b/tests/start_commands_test.go
index 2b36928b2..1a393dddd 100644
--- a/tests/start_commands_test.go
+++ b/tests/start_commands_test.go
@@ -7,8 +7,7 @@ import (
 )
 
 func (s *QemuSuite) TestStartCommands(c *C) {
-	err := s.RunQemu("--cloud-config", "./tests/assets/test_26/cloud-config.yml")
-	c.Assert(err, IsNil)
+	s.RunQemu(c, "--cloud-config", "./tests/assets/test_26/cloud-config.yml")
 
 	for i := 1; i < 5; i++ {
 		s.CheckCall(c, fmt.Sprintf("ls /home/rancher | grep test%d", i))
diff --git a/tests/subdir_test.go b/tests/subdir_test.go
index 9d4afa671..d8b42c205 100644
--- a/tests/subdir_test.go
+++ b/tests/subdir_test.go
@@ -3,9 +3,7 @@ package integration
 import . "gopkg.in/check.v1"
 
 func (s *QemuSuite) TestSubdir(c *C) {
-	err := s.RunQemu("--append", "rancher.state.directory=ros_subdir")
-	c.Assert(err, IsNil)
-
+	s.RunQemu(c, "--append", "rancher.state.directory=ros_subdir")
 	s.CheckCall(c, `
 set -x -e
 mkdir x
diff --git a/tests/swap_test.go b/tests/swap_test.go
index e062833be..abe2dfa3f 100644
--- a/tests/swap_test.go
+++ b/tests/swap_test.go
@@ -3,8 +3,7 @@ package integration
 import . "gopkg.in/check.v1"
 
 func (s *QemuSuite) TestSwap(c *C) {
-	err := s.RunQemu("--cloud-config", "./tests/assets/test_21/cloud-config.yml", "--second-drive")
-	c.Assert(err, IsNil)
+	s.RunQemu(c, "--cloud-config", "./tests/assets/test_21/cloud-config.yml", "--second-drive")
 
 	s.CheckCall(c, "sudo mkswap /dev/vdb")
 	s.CheckCall(c, "sudo cloud-init-execute")
diff --git a/tests/sysctl_test.go b/tests/sysctl_test.go
index b7b3ff3b4..865f8b47d 100644
--- a/tests/sysctl_test.go
+++ b/tests/sysctl_test.go
@@ -3,8 +3,7 @@ package integration
 import . "gopkg.in/check.v1"
 
 func (s *QemuSuite) TestSysctl(c *C) {
-	err := s.RunQemu("--cloud-config", "./tests/assets/test_20/cloud-config.yml")
-	c.Assert(err, IsNil)
+	s.RunQemu(c, "--cloud-config", "./tests/assets/test_20/cloud-config.yml")
 
 	s.CheckCall(c, "sudo cat /proc/sys/kernel/domainname | grep test")
 	s.CheckCall(c, "sudo cat /proc/sys/dev/cdrom/debug | grep 1")
diff --git a/tests/tls_test.go b/tests/tls_test.go
index 7a816f975..55894febe 100644
--- a/tests/tls_test.go
+++ b/tests/tls_test.go
@@ -3,9 +3,7 @@ package integration
 import . "gopkg.in/check.v1"
 
 func (s *QemuSuite) TestTls(c *C) {
-	err := s.RunQemu("--cloud-config", "./tests/assets/test_02/cloud-config.yml")
-	c.Assert(err, IsNil)
-
+	s.RunQemu(c, "--cloud-config", "./tests/assets/test_02/cloud-config.yml")
 	s.CheckCall(c, `
 set -e -x
 sudo ros tls gen
diff --git a/tests/upgrade_test.go b/tests/upgrade_test.go
index d1067c2e8..6167bd226 100644
--- a/tests/upgrade_test.go
+++ b/tests/upgrade_test.go
@@ -7,8 +7,7 @@ import (
 )
 
 func (s *QemuSuite) TestUpgrade(c *C) {
-	err := s.RunQemuInstalled()
-	c.Assert(err, IsNil)
+	s.RunQemuInstalled(c)
 
 	s.CheckCall(c, `
 set -ex
diff --git a/tests/write_files_test.go b/tests/write_files_test.go
index cfea784f1..84f27a7f9 100644
--- a/tests/write_files_test.go
+++ b/tests/write_files_test.go
@@ -3,8 +3,7 @@ package integration
 import . "gopkg.in/check.v1"
 
 func (s *QemuSuite) TestWriteFiles(c *C) {
-	err := s.RunQemu("--cloud-config", "./tests/assets/test_24/cloud-config.yml")
-	c.Assert(err, IsNil)
+	s.RunQemu(c, "--cloud-config", "./tests/assets/test_24/cloud-config.yml")
 
 	s.CheckCall(c, "sudo cat /test | grep 'console content'")
 	s.CheckCall(c, "sudo cat /test2 | grep 'console content'")