Merge lp:~fgimenez/snappy/cli-pkg into lp:~snappy-dev/snappy/snappy-moved-to-github

[Federico Gimenez]

cli package with ExecCommand functions

cli package with ExecCommand functions

The cli package unit tests have been implemented using the technique described in [1]. Also the remaining unnamed "common" package imports and the references to check when importing the gocheck package have been removed.

[1] http://npf.io/2015/06/testing-exec-command/

[Leo Arias (elopio)]

needs a merge with trunk.
Feel free to top approve it after you get a full successful run.

Thanks!

review: Needs Fixing

[lp:~fgimenez/snappy/cli-pkg]

721. By Federico Gimenez on 2015-10-02

merged trunk

722. By Federico Gimenez on 2015-10-02

config_test updated to cli

[Federico Gimenez (fgimenez)]

Merged and working, thanks Leo

review: Approve

=== modified file '_integration-tests/tests/apt_test.go'
--- _integration-tests/tests/apt_test.go	2015-07-28 04:03:52 +0000
+++ _integration-tests/tests/apt_test.go	2015-10-02 10:23:57 +0000
@@ -20,19 +20,20 @@
 package tests
 
 import (
-	. "launchpad.net/snappy/_integration-tests/testutils/common"
+	"launchpad.net/snappy/_integration-tests/testutils/cli"
+	"launchpad.net/snappy/_integration-tests/testutils/common"
 
-	check "gopkg.in/check.v1"
+	"gopkg.in/check.v1"
 )
 
 var _ = check.Suite(&aptSuite{})
 
 type aptSuite struct {
-	SnappySuite
+	common.SnappySuite
 }
 
 func (s *aptSuite) TestAptGetMustPrintError(c *check.C) {
-	aptOutput := ExecCommand(c, "apt-get", "update")
+	aptOutput := cli.ExecCommand(c, "apt-get", "update")
 
 	expected := "Ubuntu Core does not use apt-get, see 'snappy --help'!\n"
 	c.Assert(aptOutput, check.Equals, expected)
 
=== modified file '_integration-tests/tests/config_test.go'
--- _integration-tests/tests/config_test.go	2015-09-30 08:07:52 +0000
+++ _integration-tests/tests/config_test.go	2015-10-02 10:23:57 +0000
@@ -24,6 +24,7 @@
 	"os"
 	"strings"
 
+	"launchpad.net/snappy/_integration-tests/testutils/cli"
 	"launchpad.net/snappy/_integration-tests/testutils/common"
 
 	"gopkg.in/check.v1"
@@ -97,13 +98,13 @@
 	}
 	_, err = configFile.Write([]byte(config))
 
-	common.ExecCommand(c, "sudo", "snappy", "config", "ubuntu-core", configFile.Name())
+	cli.ExecCommand(c, "sudo", "snappy", "config", "ubuntu-core", configFile.Name())
 
 	return
 }
 
 func currentConfig(c *check.C) string {
-	return common.ExecCommand(c, "sudo", "snappy", "config", "ubuntu-core")
+	return cli.ExecCommand(c, "sudo", "snappy", "config", "ubuntu-core")
 }
 
 func configString(cfg string) string {
 
=== modified file '_integration-tests/tests/failover_rclocal_crash_test.go'
--- _integration-tests/tests/failover_rclocal_crash_test.go	2015-09-09 06:56:19 +0000
+++ _integration-tests/tests/failover_rclocal_crash_test.go	2015-10-02 10:23:57 +0000
@@ -22,26 +22,28 @@
 import (
 	"fmt"
 
-	. "launchpad.net/snappy/_integration-tests/testutils/common"
+	"launchpad.net/snappy/_integration-tests/testutils/cli"
+	"launchpad.net/snappy/_integration-tests/testutils/common"
 
-	check "gopkg.in/check.v1"
+	"gopkg.in/check.v1"
 )
 
 type rcLocalCrash struct{}
 
 func (rcLocalCrash) set(c *check.C) {
-	MakeWritable(c, BaseAltPartitionPath)
-	defer MakeReadonly(c, BaseAltPartitionPath)
-	targetFile := fmt.Sprintf("%s/etc/rc.local", BaseAltPartitionPath)
-	ExecCommand(c, "sudo", "chmod", "a+xw", targetFile)
-	ExecCommandToFile(c, targetFile,
+	common.MakeWritable(c, common.BaseAltPartitionPath)
+	defer common.MakeReadonly(c, common.BaseAltPartitionPath)
+	targetFile := fmt.Sprintf("%s/etc/rc.local", common.BaseAltPartitionPath)
+	cli.ExecCommand(c, "sudo", "chmod", "a+xw", targetFile)
+
+	cli.ExecCommandToFile(c, targetFile,
 		"sudo", "echo", "#!bin/sh\nprintf c > /proc/sysrq-trigger")
 }
 
 func (rcLocalCrash) unset(c *check.C) {
-	MakeWritable(c, BaseAltPartitionPath)
-	defer MakeReadonly(c, BaseAltPartitionPath)
-	ExecCommand(c, "sudo", "rm", fmt.Sprintf("%s/etc/rc.local", BaseAltPartitionPath))
+	common.MakeWritable(c, common.BaseAltPartitionPath)
+	defer common.MakeReadonly(c, common.BaseAltPartitionPath)
+	cli.ExecCommand(c, "sudo", "rm", fmt.Sprintf("%s/etc/rc.local", common.BaseAltPartitionPath))
 }
 
 /*
 
=== modified file '_integration-tests/tests/failover_systemd_loop_test.go'
--- _integration-tests/tests/failover_systemd_loop_test.go	2015-07-30 16:22:30 +0000
+++ _integration-tests/tests/failover_systemd_loop_test.go	2015-10-02 10:23:57 +0000
@@ -22,9 +22,10 @@
 import (
 	"fmt"
 
-	. "launchpad.net/snappy/_integration-tests/testutils/common"
+	"launchpad.net/snappy/_integration-tests/testutils/cli"
+	"launchpad.net/snappy/_integration-tests/testutils/common"
 
-	check "gopkg.in/check.v1"
+	"gopkg.in/check.v1"
 )
 
 const (
@@ -61,51 +62,51 @@
 type systemdDependencyLoop struct{}
 
 func (systemdDependencyLoop) set(c *check.C) {
-	installService(c, "deadlock", deadlockService, BaseAltPartitionPath)
-	installService(c, "emerg-reboot", rebootService, BaseAltPartitionPath)
+	installService(c, "deadlock", deadlockService, common.BaseAltPartitionPath)
+	installService(c, "emerg-reboot", rebootService, common.BaseAltPartitionPath)
 }
 
 func (systemdDependencyLoop) unset(c *check.C) {
-	unInstallService(c, "deadlock", BaseAltPartitionPath)
-	unInstallService(c, "emerg-reboot", BaseAltPartitionPath)
+	unInstallService(c, "deadlock", common.BaseAltPartitionPath)
+	unInstallService(c, "emerg-reboot", common.BaseAltPartitionPath)
 }
 
 func installService(c *check.C, serviceName, serviceCfg, basePath string) {
-	MakeWritable(c, basePath)
-	defer MakeReadonly(c, basePath)
+	common.MakeWritable(c, basePath)
+	defer common.MakeReadonly(c, basePath)
 
 	// Create service file
 	serviceFile := fmt.Sprintf("%s%s/%s.service", basePath, baseSystemdPath, serviceName)
-	ExecCommand(c, "sudo", "chmod", "a+w", fmt.Sprintf("%s%s", basePath, baseSystemdPath))
-	ExecCommandToFile(c, serviceFile, "sudo", "echo", serviceCfg)
+	cli.ExecCommand(c, "sudo", "chmod", "a+w", fmt.Sprintf("%s%s", basePath, baseSystemdPath))
+	cli.ExecCommandToFile(c, serviceFile, "sudo", "echo", serviceCfg)
 
 	// Create requires directory
 	requiresDirPart := fmt.Sprintf("%s/%s", baseSystemdPath, systemdTargetRequiresDir)
 	requiresDir := fmt.Sprintf("%s%s", basePath, requiresDirPart)
-	ExecCommand(c, "sudo", "mkdir", "-p", requiresDir)
+	cli.ExecCommand(c, "sudo", "mkdir", "-p", requiresDir)
 
 	// Symlink from the requires dir to the service file (with chroot for being
 	// usable in the other partition)
-	ExecCommand(c, "sudo", "chroot", basePath, "ln", "-s",
+	cli.ExecCommand(c, "sudo", "chroot", basePath, "ln", "-s",
 		fmt.Sprintf("%s/%s.service", baseSystemdPath, serviceName),
 		fmt.Sprintf("%s/%s.service", requiresDirPart, serviceName),
 	)
 }
 
 func unInstallService(c *check.C, serviceName, basePath string) {
-	MakeWritable(c, basePath)
-	defer MakeReadonly(c, basePath)
+	common.MakeWritable(c, basePath)
+	defer common.MakeReadonly(c, basePath)
 
 	// Disable the service
-	ExecCommand(c, "sudo", "chroot", basePath,
+	cli.ExecCommand(c, "sudo", "chroot", basePath,
 		"systemctl", "disable", fmt.Sprintf("%s.service", serviceName))
 
 	// Remove the service file
-	ExecCommand(c, "sudo", "rm",
+	cli.ExecCommand(c, "sudo", "rm",
 		fmt.Sprintf("%s%s/%s.service", basePath, baseSystemdPath, serviceName))
 
 	// Remove the requires symlink
-	ExecCommand(c, "sudo", "rm",
+	cli.ExecCommand(c, "sudo", "rm",
 		fmt.Sprintf("%s%s/%s/%s.service", basePath, baseSystemdPath, systemdTargetRequiresDir, serviceName))
 }
 
 
=== modified file '_integration-tests/tests/failover_test.go'
--- _integration-tests/tests/failover_test.go	2015-07-28 04:03:52 +0000
+++ _integration-tests/tests/failover_test.go	2015-10-02 10:23:57 +0000
@@ -20,15 +20,15 @@
 package tests
 
 import (
-	check "gopkg.in/check.v1"
+	"gopkg.in/check.v1"
 
-	. "launchpad.net/snappy/_integration-tests/testutils/common"
+	"launchpad.net/snappy/_integration-tests/testutils/common"
 )
 
 var _ = check.Suite(&failoverSuite{})
 
 type failoverSuite struct {
-	SnappySuite
+	common.SnappySuite
 }
 
 // The types that implement this interface can be used in the test logic
@@ -43,16 +43,16 @@
 // type implementing the failer interface and call this function with an instance
 // of it
 func commonFailoverTest(c *check.C, f failer) {
-	currentVersion := GetCurrentUbuntuCoreVersion(c)
+	currentVersion := common.GetCurrentUbuntuCoreVersion(c)
 
-	if AfterReboot(c) {
-		RemoveRebootMark(c)
+	if common.AfterReboot(c) {
+		common.RemoveRebootMark(c)
 		f.unset(c)
-		c.Assert(GetSavedVersion(c), check.Equals, currentVersion)
+		c.Assert(common.GetSavedVersion(c), check.Equals, currentVersion)
 	} else {
-		SetSavedVersion(c, currentVersion-1)
-		CallFakeUpdate(c)
+		common.SetSavedVersion(c, currentVersion-1)
+		common.CallFakeUpdate(c)
 		f.set(c)
-		Reboot(c)
+		common.Reboot(c)
 	}
 }
 
=== modified file '_integration-tests/tests/failover_zero_size_file_test.go'
--- _integration-tests/tests/failover_zero_size_file_test.go	2015-09-25 14:35:29 +0000
+++ _integration-tests/tests/failover_zero_size_file_test.go	2015-10-02 10:23:57 +0000
@@ -25,7 +25,8 @@
 	"path/filepath"
 	"strings"
 
-	. "launchpad.net/snappy/_integration-tests/testutils/common"
+	"launchpad.net/snappy/_integration-tests/testutils/cli"
+	"launchpad.net/snappy/_integration-tests/testutils/common"
 	"launchpad.net/snappy/_integration-tests/testutils/partition"
 
 	"gopkg.in/check.v1"
@@ -45,11 +46,11 @@
 type zeroSizeSystemd struct{}
 
 func (zeroSizeKernel) set(c *check.C) {
-	commonSet(c, BaseAltPartitionPath, origBootFilenamePattern, kernelFilename)
+	commonSet(c, common.BaseAltPartitionPath, origBootFilenamePattern, kernelFilename)
 }
 
 func (zeroSizeKernel) unset(c *check.C) {
-	commonUnset(c, BaseAltPartitionPath, origBootFilenamePattern, kernelFilename)
+	commonUnset(c, common.BaseAltPartitionPath, origBootFilenamePattern, kernelFilename)
 }
 
 func (zeroSizeInitrd) set(c *check.C) {
@@ -71,11 +72,11 @@
 }
 
 func (zeroSizeSystemd) set(c *check.C) {
-	commonSet(c, BaseAltPartitionPath, origSystemdFilenamePattern, systemdFilename)
+	commonSet(c, common.BaseAltPartitionPath, origSystemdFilenamePattern, systemdFilename)
 }
 
 func (zeroSizeSystemd) unset(c *check.C) {
-	commonUnset(c, BaseAltPartitionPath, origSystemdFilenamePattern, systemdFilename)
+	commonUnset(c, common.BaseAltPartitionPath, origSystemdFilenamePattern, systemdFilename)
 }
 
 func commonSet(c *check.C, baseOtherPath, origPattern, filename string) {
@@ -105,17 +106,17 @@
 func renameFile(c *check.C, basePath, oldFilename, newFilename string, keepOld bool) {
 	// Only need to make writable and revert for BaseAltPartitionPath,
 	// kernel files' boot directory is writable
-	if basePath == BaseAltPartitionPath {
-		MakeWritable(c, basePath)
-		defer MakeReadonly(c, basePath)
+	if basePath == common.BaseAltPartitionPath {
+		common.MakeWritable(c, basePath)
+		defer common.MakeReadonly(c, basePath)
 	}
 
-	ExecCommand(c, "sudo", "mv", oldFilename, newFilename)
+	cli.ExecCommand(c, "sudo", "mv", oldFilename, newFilename)
 
 	if keepOld {
-		ExecCommand(c, "sudo", "touch", oldFilename)
+		cli.ExecCommand(c, "sudo", "touch", oldFilename)
 		mode := getFileMode(c, newFilename)
-		ExecCommand(c, "sudo", "chmod", fmt.Sprintf("%o", mode), oldFilename)
+		cli.ExecCommand(c, "sudo", "chmod", fmt.Sprintf("%o", mode), oldFilename)
 	}
 }
 
 
=== modified file '_integration-tests/tests/helloDbus_test.go'
--- _integration-tests/tests/helloDbus_test.go	2015-09-11 08:47:39 +0000
+++ _integration-tests/tests/helloDbus_test.go	2015-10-02 10:23:57 +0000
@@ -20,6 +20,7 @@
 package tests
 
 import (
+	"launchpad.net/snappy/_integration-tests/testutils/cli"
 	"launchpad.net/snappy/_integration-tests/testutils/common"
 
 	"gopkg.in/check.v1"
@@ -38,7 +39,7 @@
 	common.InstallSnap(c, "hello-dbus-app.canonical")
 	defer common.RemoveSnap(c, "hello-dbus-app.canonical")
 
-	output := common.ExecCommand(c, "hello-dbus-app.client")
+	output := cli.ExecCommand(c, "hello-dbus-app.client")
 
 	expected := "PASS\n"
 
 
=== modified file '_integration-tests/tests/info_test.go'
--- _integration-tests/tests/info_test.go	2015-07-31 07:55:33 +0000
+++ _integration-tests/tests/info_test.go	2015-10-02 10:23:57 +0000
@@ -22,41 +22,42 @@
 import (
 	"fmt"
 
-	. "launchpad.net/snappy/_integration-tests/testutils/common"
+	"launchpad.net/snappy/_integration-tests/testutils/cli"
+	"launchpad.net/snappy/_integration-tests/testutils/common"
 
-	check "gopkg.in/check.v1"
+	"gopkg.in/check.v1"
 )
 
 var _ = check.Suite(&infoSuite{})
 
 type infoSuite struct {
-	SnappySuite
+	common.SnappySuite
 }
 
 func (s *infoSuite) TestInfoMustPrintReleaseAndChannel(c *check.C) {
 	// skip test when having a remote testbed (we can't know which the
 	// release and channels are)
-	if Cfg.RemoteTestbed {
+	if common.Cfg.RemoteTestbed {
 		c.Skip(fmt.Sprintf(
 			"Skipping %s while testing in remote testbed",
 			c.TestName()))
 	}
 
-	infoOutput := ExecCommand(c, "snappy", "info")
+	infoOutput := cli.ExecCommand(c, "snappy", "info")
 
 	expected := "(?ms)" +
-		fmt.Sprintf("^release: ubuntu-core/%s/%s\n", Cfg.Release, Cfg.Channel) +
+		fmt.Sprintf("^release: ubuntu-core/%s/%s\n", common.Cfg.Release, common.Cfg.Channel) +
 		".*"
 
 	c.Assert(infoOutput, check.Matches, expected)
 }
 
 func (s *infoSuite) TestInfoMustPrintInstalledApps(c *check.C) {
-	InstallSnap(c, "hello-world")
+	common.InstallSnap(c, "hello-world")
 	s.AddCleanup(func() {
-		RemoveSnap(c, "hello-world")
+		common.RemoveSnap(c, "hello-world")
 	})
-	infoOutput := ExecCommand(c, "snappy", "info")
+	infoOutput := cli.ExecCommand(c, "snappy", "info")
 
 	expected := "(?ms)" +
 		".*" +
@@ -65,11 +66,11 @@
 }
 
 func (s *infoSuite) TestInfoMustPrintInstalledFrameworks(c *check.C) {
-	InstallSnap(c, "hello-dbus-fwk.canonical")
+	common.InstallSnap(c, "hello-dbus-fwk.canonical")
 	s.AddCleanup(func() {
-		RemoveSnap(c, "hello-dbus-fwk.canonical")
+		common.RemoveSnap(c, "hello-dbus-fwk.canonical")
 	})
-	infoOutput := ExecCommand(c, "snappy", "info")
+	infoOutput := cli.ExecCommand(c, "snappy", "info")
 
 	expected := "(?ms)" +
 		".*" +
 
=== modified file '_integration-tests/tests/installApp_test.go'
--- _integration-tests/tests/installApp_test.go	2015-09-24 19:51:26 +0000
+++ _integration-tests/tests/installApp_test.go	2015-10-02 10:23:57 +0000
@@ -23,10 +23,11 @@
 	"net/http"
 	"os/exec"
 
+	"launchpad.net/snappy/_integration-tests/testutils/cli"
 	"launchpad.net/snappy/_integration-tests/testutils/common"
 	"launchpad.net/snappy/_integration-tests/testutils/wait"
 
-	check "gopkg.in/check.v1"
+	"gopkg.in/check.v1"
 )
 
 var _ = check.Suite(&installAppSuite{})
@@ -57,7 +58,7 @@
 		common.RemoveSnap(c, "hello-world")
 	})
 
-	echoOutput := common.ExecCommand(c, "hello-world.echo")
+	echoOutput := cli.ExecCommand(c, "hello-world.echo")
 
 	c.Assert(echoOutput, check.Equals, "Hello World!\n")
 }
@@ -89,7 +90,7 @@
 		common.RemoveSnap(c, "hello-world")
 	})
 
-	infoOutput := common.ExecCommand(c, "snappy", "info")
+	infoOutput := cli.ExecCommand(c, "snappy", "info")
 
 	expected := "(?ms).*^apps: hello-world.canonical\n"
 	c.Assert(infoOutput, check.Matches, expected)
 
=== modified file '_integration-tests/tests/installFramework_test.go'
--- _integration-tests/tests/installFramework_test.go	2015-09-03 10:46:21 +0000
+++ _integration-tests/tests/installFramework_test.go	2015-10-02 10:23:57 +0000
@@ -23,10 +23,11 @@
 	"fmt"
 	"regexp"
 
+	"launchpad.net/snappy/_integration-tests/testutils/cli"
 	"launchpad.net/snappy/_integration-tests/testutils/common"
 	"launchpad.net/snappy/_integration-tests/testutils/wait"
 
-	check "gopkg.in/check.v1"
+	"gopkg.in/check.v1"
 )
 
 var _ = check.Suite(&installFrameworkSuite{})
@@ -50,7 +51,7 @@
 	err := wait.ForActiveService(c, dockerService)
 	c.Assert(err, check.IsNil)
 
-	statusOutput := common.ExecCommand(
+	statusOutput := cli.ExecCommand(
 		c, "systemctl", "status",
 		dockerService)
 
 
=== modified file '_integration-tests/tests/list_test.go'
--- _integration-tests/tests/list_test.go	2015-07-28 04:03:52 +0000
+++ _integration-tests/tests/list_test.go	2015-10-02 10:23:57 +0000
@@ -23,16 +23,17 @@
 	"fmt"
 	"os"
 
-	. "launchpad.net/snappy/_integration-tests/testutils/common"
+	"launchpad.net/snappy/_integration-tests/testutils/cli"
+	"launchpad.net/snappy/_integration-tests/testutils/common"
 
 	"github.com/mvo5/goconfigparser"
-	check "gopkg.in/check.v1"
+	"gopkg.in/check.v1"
 )
 
 var _ = check.Suite(&listSuite{})
 
 type listSuite struct {
-	SnappySuite
+	common.SnappySuite
 }
 
 func getVersionFromConfig(c *check.C) string {
@@ -51,7 +52,7 @@
 }
 
 func (s *listSuite) TestListMustPrintCoreVersion(c *check.C) {
-	listOutput := ExecCommand(c, "snappy", "list")
+	listOutput := cli.ExecCommand(c, "snappy", "list")
 
 	expected := "(?ms)" +
 		"Name +Date +Version +Developer *\n" +
@@ -62,12 +63,12 @@
 }
 
 func (s *listSuite) TestListMustPrintAppVersion(c *check.C) {
-	InstallSnap(c, "hello-world")
+	common.InstallSnap(c, "hello-world")
 	s.AddCleanup(func() {
-		RemoveSnap(c, "hello-world")
+		common.RemoveSnap(c, "hello-world")
 	})
 
-	listOutput := ExecCommand(c, "snappy", "list")
+	listOutput := cli.ExecCommand(c, "snappy", "list")
 	expected := "(?ms)" +
 		"Name +Date +Version +Developer *\n" +
 		".*" +
 
=== modified file '_integration-tests/tests/rollback_test.go'
--- _integration-tests/tests/rollback_test.go	2015-10-01 14:40:47 +0000
+++ _integration-tests/tests/rollback_test.go	2015-10-02 10:23:57 +0000
@@ -22,37 +22,38 @@
 import (
 	"strconv"
 
-	. "launchpad.net/snappy/_integration-tests/testutils/common"
+	"launchpad.net/snappy/_integration-tests/testutils/cli"
+	"launchpad.net/snappy/_integration-tests/testutils/common"
 	"launchpad.net/snappy/_integration-tests/testutils/partition"
 	"launchpad.net/snappy/_integration-tests/testutils/wait"
 
-	check "gopkg.in/check.v1"
+	"gopkg.in/check.v1"
 )
 
 var _ = check.Suite(&rollbackSuite{})
 
 type rollbackSuite struct {
-	SnappySuite
+	common.SnappySuite
 }
 
 func (s *rollbackSuite) TestRollbackMustRebootToOtherVersion(c *check.C) {
-	if BeforeReboot() {
-		CallFakeUpdate(c)
-		Reboot(c)
-	} else if CheckRebootMark(c.TestName()) {
-		RemoveRebootMark(c)
+	if common.BeforeReboot() {
+		common.CallFakeUpdate(c)
+		common.Reboot(c)
+	} else if common.CheckRebootMark(c.TestName()) {
+		common.RemoveRebootMark(c)
 		// Workaround for bug https://bugs.launchpad.net/snappy/+bug/1498293
 		// TODO remove once the bug is fixed. --elopio - 2015-09-30
 		wait.ForFunction(c, "regular", partition.Mode)
-		currentVersion := GetCurrentUbuntuCoreVersion(c)
-		c.Assert(currentVersion > GetSavedVersion(c), check.Equals, true)
-		ExecCommand(c, "sudo", "snappy", "rollback", "ubuntu-core",
-			strconv.Itoa(GetSavedVersion(c)))
-		SetSavedVersion(c, currentVersion)
-		RebootWithMark(c, c.TestName()+"-rollback")
-	} else if CheckRebootMark(c.TestName() + "-rollback") {
-		RemoveRebootMark(c)
+		currentVersion := common.GetCurrentUbuntuCoreVersion(c)
+		c.Assert(currentVersion > common.GetSavedVersion(c), check.Equals, true)
+		cli.ExecCommand(c, "sudo", "snappy", "rollback", "ubuntu-core",
+			strconv.Itoa(common.GetSavedVersion(c)))
+		common.SetSavedVersion(c, currentVersion)
+		common.RebootWithMark(c, c.TestName()+"-rollback")
+	} else if common.CheckRebootMark(c.TestName() + "-rollback") {
+		common.RemoveRebootMark(c)
 		c.Assert(
-			GetCurrentUbuntuCoreVersion(c) < GetSavedVersion(c), check.Equals, true)
+			common.GetCurrentUbuntuCoreVersion(c) < common.GetSavedVersion(c), check.Equals, true)
 	}
 }
 
=== modified file '_integration-tests/tests/search_test.go'
--- _integration-tests/tests/search_test.go	2015-07-28 04:03:52 +0000
+++ _integration-tests/tests/search_test.go	2015-10-02 10:23:57 +0000
@@ -20,19 +20,20 @@
 package tests
 
 import (
-	. "launchpad.net/snappy/_integration-tests/testutils/common"
+	"launchpad.net/snappy/_integration-tests/testutils/cli"
+	"launchpad.net/snappy/_integration-tests/testutils/common"
 
-	. "gopkg.in/check.v1"
+	"gopkg.in/check.v1"
 )
 
-var _ = Suite(&searchSuite{})
+var _ = check.Suite(&searchSuite{})
 
 type searchSuite struct {
-	SnappySuite
+	common.SnappySuite
 }
 
-func (s *searchSuite) TestSearchFrameworkMustPrintMatch(c *C) {
-	searchOutput := ExecCommand(c, "snappy", "search", "hello-dbus-fwk")
+func (s *searchSuite) TestSearchFrameworkMustPrintMatch(c *check.C) {
+	searchOutput := cli.ExecCommand(c, "snappy", "search", "hello-dbus-fwk")
 
 	expected := "(?ms)" +
 		"Name +Version +Summary *\n" +
@@ -40,5 +41,5 @@
 		"^hello-dbus-fwk +.* +hello-dbus-fwk *\n" +
 		".*"
 
-	c.Assert(searchOutput, Matches, expected)
+	c.Assert(searchOutput, check.Matches, expected)
 }
 
=== modified file '_integration-tests/tests/ubuntuFan_test.go'
--- _integration-tests/tests/ubuntuFan_test.go	2015-09-24 21:06:01 +0000
+++ _integration-tests/tests/ubuntuFan_test.go	2015-10-02 10:23:57 +0000
@@ -25,6 +25,7 @@
 	"os/exec"
 	"strings"
 
+	"launchpad.net/snappy/_integration-tests/testutils/cli"
 	"launchpad.net/snappy/_integration-tests/testutils/common"
 	"launchpad.net/snappy/_integration-tests/testutils/wait"
 
@@ -75,7 +76,7 @@
 }
 
 func (s *fanTestSuite) TestFanCommandCreatesFanBridge(c *check.C) {
-	output := common.ExecCommand(c, "ifconfig")
+	output := cli.ExecCommand(c, "ifconfig")
 
 	expectedPattern := fmt.Sprintf("(?msi).*%s.*%s.*", s.fanName(), s.bridgeIP)
 
@@ -89,7 +90,7 @@
 	s.configureDockerToUseBridge(c)
 	defer s.removeBridgeFromDockerConf(c)
 
-	output := common.ExecCommand(c, "docker", "run", "-t", baseContainer, "ifconfig")
+	output := cli.ExecCommand(c, "docker", "run", "-t", baseContainer, "ifconfig")
 
 	expectedIP := strings.TrimRight(s.bridgeIP, ".1") + ".2"
 	expectedPattern := fmt.Sprintf("(?ms).*inet addr:%s.*", expectedIP)
@@ -105,12 +106,12 @@
 	defer s.removeBridgeFromDockerConf(c)
 
 	// spin up first container
-	common.ExecCommand(c, "docker", "run", "-d", "-t", baseContainer)
+	cli.ExecCommand(c, "docker", "run", "-d", "-t", baseContainer)
 	// the first assigned IP in the fan will end with ".2"
 	firstIPAddr := strings.TrimRight(s.bridgeIP, ".1") + ".2"
 
 	// ping from a second container
-	output := common.ExecCommand(c, "docker", "run", "-t", baseContainer, "ping", firstIPAddr, "-c", "1")
+	output := cli.ExecCommand(c, "docker", "run", "-t", baseContainer, "ping", firstIPAddr, "-c", "1")
 
 	expectedPattern := "(?ms).*1 packets transmitted, 1 packets received, 0% packet loss.*"
 
@@ -142,14 +143,14 @@
 }
 
 func (s *fanTestSuite) fanCtl(c *check.C, cmd string) string {
-	return common.ExecCommand(c,
+	return cli.ExecCommand(c,
 		"sudo", "fanctl", cmd, firstOverlaySegment+".0.0.0/8", s.subjectIP+"/16")
 }
 
 func (s *fanTestSuite) configureDockerToUseBridge(c *check.C) {
 	cfgFile := dockerCfgFile(c)
 
-	common.ExecCommand(c, "sudo", "sed", "-i",
+	cli.ExecCommand(c, "sudo", "sed", "-i",
 		fmt.Sprintf(`s/DOCKER_OPTIONS=\"\"/DOCKER_OPTIONS=\"%s\"/`, s.dockerOptions()),
 		cfgFile)
 
@@ -159,7 +160,7 @@
 func (s *fanTestSuite) removeBridgeFromDockerConf(c *check.C) {
 	cfgFile := dockerCfgFile(c)
 
-	common.ExecCommand(c, "sudo", "sed", "-i",
+	cli.ExecCommand(c, "sudo", "sed", "-i",
 		`s/DOCKER_OPTIONS=\".*\"/DOCKER_OPTIONS=\"\"/`,
 		cfgFile)
 
@@ -175,7 +176,7 @@
 	dockerVersion := common.GetCurrentVersion(c, "docker")
 	dockerService := fmt.Sprintf("docker_docker-daemon_%s.service", dockerVersion)
 
-	common.ExecCommand(c, "sudo", "systemctl", "restart", dockerService)
+	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")
@@ -199,7 +200,7 @@
 	err := wait.ForActiveService(c, dockerService)
 	c.Assert(err, check.IsNil)
 
-	common.ExecCommand(c, "docker", "pull", baseContainer)
+	cli.ExecCommand(c, "docker", "pull", baseContainer)
 }
 
 func tearDownDocker(c *check.C) {
 
=== modified file '_integration-tests/tests/update_test.go'
--- _integration-tests/tests/update_test.go	2015-09-10 15:55:23 +0000
+++ _integration-tests/tests/update_test.go	2015-10-02 10:23:57 +0000
@@ -23,7 +23,7 @@
 	"io/ioutil"
 	"path"
 
-	. "launchpad.net/snappy/_integration-tests/testutils/common"
+	"launchpad.net/snappy/_integration-tests/testutils/common"
 	"launchpad.net/snappy/_integration-tests/testutils/partition"
 
 	"gopkg.in/check.v1"
@@ -32,7 +32,7 @@
 var _ = check.Suite(&updateSuite{})
 
 type updateSuite struct {
-	SnappySuite
+	common.SnappySuite
 }
 
 func (s *updateSuite) assertBootDirContents(c *check.C) {
@@ -62,17 +62,17 @@
 // modified to fake an update. If there is a version available, the image will
 // be up-to-date after running this test.
 func (s *updateSuite) TestUpdateToSameReleaseAndChannel(c *check.C) {
-	if BeforeReboot() {
-		updateOutput := CallFakeUpdate(c)
+	if common.BeforeReboot() {
+		updateOutput := common.CallFakeUpdate(c)
 		expected := "(?ms)" +
 			".*" +
 			"^Reboot to use .*ubuntu-core.\n"
 		c.Assert(updateOutput, check.Matches, expected)
 		s.assertBootDirContents(c)
-		Reboot(c)
-	} else if AfterReboot(c) {
-		RemoveRebootMark(c)
-		c.Assert(GetCurrentUbuntuCoreVersion(c) > GetSavedVersion(c),
+		common.Reboot(c)
+	} else if common.AfterReboot(c) {
+		common.RemoveRebootMark(c)
+		c.Assert(common.GetCurrentUbuntuCoreVersion(c) > common.GetSavedVersion(c),
 			check.Equals, true)
 	}
 }
 
=== modified file '_integration-tests/tests/writablePaths_test.go'
--- _integration-tests/tests/writablePaths_test.go	2015-07-28 04:03:52 +0000
+++ _integration-tests/tests/writablePaths_test.go	2015-10-02 10:23:57 +0000
@@ -27,9 +27,9 @@
 	"path/filepath"
 	"strings"
 
-	. "launchpad.net/snappy/_integration-tests/testutils/common"
+	"launchpad.net/snappy/_integration-tests/testutils/common"
 
-	check "gopkg.in/check.v1"
+	"gopkg.in/check.v1"
 )
 
 const writablePathsListFile = "/etc/system-image/writable-paths"
@@ -37,7 +37,7 @@
 var _ = check.Suite(&writablePathsSuite{})
 
 type writablePathsSuite struct {
-	SnappySuite
+	common.SnappySuite
 }
 
 var IsWritable check.Checker = &isWritable{}
 
=== modified file '_integration-tests/testutils/build/snap.go'
--- _integration-tests/testutils/build/snap.go	2015-09-28 10:35:06 +0000
+++ _integration-tests/testutils/build/snap.go	2015-10-02 10:23:57 +0000
@@ -24,7 +24,7 @@
 	"path/filepath"
 
 	"gopkg.in/check.v1"
-	"launchpad.net/snappy/_integration-tests/testutils/common"
+	"launchpad.net/snappy/_integration-tests/testutils/cli"
 )
 
 const (
@@ -42,11 +42,11 @@
 
 var (
 	// dependency aliasing
-	commonExecCommand = common.ExecCommand
+	cliExecCommand = cli.ExecCommand
 )
 
 func buildSnap(c *check.C, snapPath string) string {
-	return commonExecCommand(c, "snappy", "build", snapPath, "-o", snapPath)
+	return cliExecCommand(c, "snappy", "build", snapPath, "-o", snapPath)
 }
 
 // LocalSnap issues the command to build a snap and returns the path of the generated file
 
=== modified file '_integration-tests/testutils/build/snap_test.go'
--- _integration-tests/testutils/build/snap_test.go	2015-09-28 10:44:44 +0000
+++ _integration-tests/testutils/build/snap_test.go	2015-10-02 10:23:57 +0000
@@ -37,13 +37,13 @@
 var _ = check.Suite(&snapBuildTestSuite{})
 
 func (s *snapBuildTestSuite) SetUpSuite(c *check.C) {
-	s.backExecCommand = commonExecCommand
-	commonExecCommand = s.fakeExecCommand
+	s.backExecCommand = cliExecCommand
+	cliExecCommand = s.fakeExecCommand
 	s.defaultSnapName = "mySnapName"
 }
 
 func (s *snapBuildTestSuite) TearDownSuite(c *check.C) {
-	commonExecCommand = s.backExecCommand
+	cliExecCommand = s.backExecCommand
 }
 
 func (s *snapBuildTestSuite) SetUpTest(c *check.C) {
 
=== added directory '_integration-tests/testutils/cli'
=== added file '_integration-tests/testutils/cli/cli.go'
--- _integration-tests/testutils/cli/cli.go	1970-01-01 00:00:00 +0000
+++ _integration-tests/testutils/cli/cli.go	2015-10-02 10:23:57 +0000
@@ -0,0 +1,57 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package cli
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"strings"
+
+	"gopkg.in/check.v1"
+)
+
+var execCommand = exec.Command
+
+// ExecCommand executes a shell command and returns a string with the output
+// of the command. In case of error, it will fail the test.
+func ExecCommand(c *check.C, cmds ...string) string {
+	fmt.Println(strings.Join(cmds, " "))
+	cmd := execCommand(cmds[0], cmds[1:len(cmds)]...)
+	output, err := cmd.CombinedOutput()
+	stringOutput := string(output)
+	fmt.Print(stringOutput)
+	c.Assert(err, check.IsNil, check.Commentf("Error: %v", stringOutput))
+	return stringOutput
+}
+
+// ExecCommandToFile executes a shell command and saves the output of the
+// command to a file. In case of error, it will fail the test.
+func ExecCommandToFile(c *check.C, filename string, cmds ...string) {
+	cmd := execCommand(cmds[0], cmds[1:len(cmds)]...)
+	outfile, err := os.Create(filename)
+	c.Assert(err, check.IsNil, check.Commentf("Error creating output file %s", filename))
+
+	defer outfile.Close()
+	cmd.Stdout = outfile
+
+	err = cmd.Run()
+	c.Assert(err, check.IsNil, check.Commentf("Error executing command '%v': %v", cmds, err))
+}
 
=== added file '_integration-tests/testutils/cli/cli_test.go'
--- _integration-tests/testutils/cli/cli_test.go	1970-01-01 00:00:00 +0000
+++ _integration-tests/testutils/cli/cli_test.go	2015-10-02 10:23:57 +0000
@@ -0,0 +1,85 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package cli
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"testing"
+
+	"gopkg.in/check.v1"
+)
+
+const execOutput = "myoutput"
+
+// Hook up check.v1 into the "go test" runner
+func Test(t *testing.T) { check.TestingT(t) }
+
+type cliTestSuite struct {
+	backExecCommand func(string, ...string) *exec.Cmd
+}
+
+var _ = check.Suite(&cliTestSuite{})
+
+func (s *cliTestSuite) SetUpSuite(c *check.C) {
+	s.backExecCommand = execCommand
+	execCommand = s.fakeExecCommand
+}
+
+func (s *cliTestSuite) TearDownSuite(c *check.C) {
+	execCommand = s.backExecCommand
+}
+
+func (s *cliTestSuite) fakeExecCommand(command string, args ...string) *exec.Cmd {
+	cs := []string{"-check.f=cliTestSuite.TestHelperProcess", "--", command}
+	cs = append(cs, args...)
+	cmd := exec.Command(os.Args[0], cs...)
+	cmd.Env = []string{"GO_WANT_HELPER_PROCESS=1"}
+	return cmd
+}
+
+func (s *cliTestSuite) TestHelperProcess(c *check.C) {
+	if os.Getenv("GO_WANT_HELPER_PROCESS") != "1" {
+		return
+	}
+	fmt.Fprintf(os.Stdout, execOutput)
+	os.Exit(0)
+}
+
+func (s *cliTestSuite) TestExecCommand(c *check.C) {
+	actualOutput := ExecCommand(c, "mycmd")
+
+	c.Assert(actualOutput, check.Equals, execOutput)
+}
+
+func (s *cliTestSuite) TestExecCommandToFile(c *check.C) {
+	outputFile, err := ioutil.TempFile("", "snappy-exec")
+	c.Assert(err, check.IsNil)
+	outputFile.Close()
+	defer os.Remove(outputFile.Name())
+
+	ExecCommandToFile(c, outputFile.Name(), "mycmd")
+
+	actualFileContents, err := ioutil.ReadFile(outputFile.Name())
+	c.Assert(err, check.IsNil)
+	c.Assert(string(actualFileContents), check.Equals, execOutput)
+}
 
=== modified file '_integration-tests/testutils/common/common.go'
--- _integration-tests/testutils/common/common.go	2015-09-28 14:42:52 +0000
+++ _integration-tests/testutils/common/common.go	2015-10-02 10:23:57 +0000
@@ -23,7 +23,6 @@
 	"fmt"
 	"io/ioutil"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"regexp"
 	"strconv"
@@ -31,6 +30,7 @@
 
 	"gopkg.in/check.v1"
 
+	"launchpad.net/snappy/_integration-tests/testutils/cli"
 	"launchpad.net/snappy/_integration-tests/testutils/config"
 )
 
@@ -54,8 +54,8 @@
 // SetUpSuite disables the snappy autopilot. It will run before all the
 // integration suites.
 func (s *SnappySuite) SetUpSuite(c *check.C) {
-	ExecCommand(c, "sudo", "systemctl", "stop", "snappy-autopilot.timer")
-	ExecCommand(c, "sudo", "systemctl", "disable", "snappy-autopilot.timer")
+	cli.ExecCommand(c, "sudo", "systemctl", "stop", "snappy-autopilot.timer")
+	cli.ExecCommand(c, "sudo", "systemctl", "disable", "snappy-autopilot.timer")
 	var err error
 	Cfg, err = config.ReadConfig(
 		"_integration-tests/data/output/testconfig.json")
@@ -66,7 +66,7 @@
 			switchSystemImageConf(c, Cfg.TargetRelease, Cfg.TargetChannel, "0")
 			// Always use the installed snappy because we are updating from an old
 			// image, so we should not use the snappy from the branch.
-			output := ExecCommand(c, "sudo", "/usr/bin/snappy", "update")
+			output := cli.ExecCommand(c, "sudo", "/usr/bin/snappy", "update")
 			if output != "" {
 				RebootWithMark(c, "setupsuite-update")
 			}
@@ -77,7 +77,7 @@
 		Cfg.Update = false
 		Cfg.Write()
 		if Cfg.Rollback {
-			ExecCommand(c, "sudo", "snappy", "rollback", "ubuntu-core")
+			cli.ExecCommand(c, "sudo", "snappy", "rollback", "ubuntu-core")
 			RebootWithMark(c, "setupsuite-rollback")
 		}
 	} else if CheckRebootMark("setupsuite-rollback") {
@@ -131,7 +131,7 @@
 				defer MakeReadonly(c, target)
 				original := filepath.Join(target, channelCfgFile)
 				c.Logf("Restoring %s...", original)
-				ExecCommand(c, "sudo", "mv", backup, original)
+				cli.ExecCommand(c, "sudo", "mv", backup, original)
 			}
 		}
 	}
@@ -169,12 +169,12 @@
 	}
 	for value, regex := range replaceRegex {
 		if value != "" {
-			ExecCommand(c,
+			cli.ExecCommand(c,
 				"sudo", "sed", "-i", fmt.Sprintf(regex, value), file)
 		}
 	}
 	// Leave the new file in the test log.
-	ExecCommand(c, "cat", file)
+	cli.ExecCommand(c, "cat", file)
 }
 
 func channelCfgBackupFile() string {
@@ -185,35 +185,9 @@
 	return filepath.Join(os.Getenv("ADT_ARTIFACTS"), "channel.ini.other")
 }
 
-// ExecCommand executes a shell command and returns a string with the output
-// of the command. In case of error, it will fail the test.
-func ExecCommand(c *check.C, cmds ...string) string {
-	fmt.Println(strings.Join(cmds, " "))
-	cmd := exec.Command(cmds[0], cmds[1:len(cmds)]...)
-	output, err := cmd.CombinedOutput()
-	stringOutput := string(output)
-	fmt.Print(stringOutput)
-	c.Assert(err, check.IsNil, check.Commentf("Error: %v", stringOutput))
-	return stringOutput
-}
-
-// ExecCommandToFile executes a shell command and saves the output of the
-// command to a file. In case of error, it will fail the test.
-func ExecCommandToFile(c *check.C, filename string, cmds ...string) {
-	cmd := exec.Command(cmds[0], cmds[1:len(cmds)]...)
-	outfile, err := os.Create(filename)
-	c.Assert(err, check.IsNil, check.Commentf("Error creating output file %s", filename))
-
-	defer outfile.Close()
-	cmd.Stdout = outfile
-
-	err = cmd.Run()
-	c.Assert(err, check.IsNil, check.Commentf("Error executing command '%v': %v", cmds, err))
-}
-
 // GetCurrentVersion returns the version of the installed and active package.
 func GetCurrentVersion(c *check.C, packageName string) string {
-	output := ExecCommand(c, "snappy", "list")
+	output := cli.ExecCommand(c, "snappy", "list")
 	pattern := "(?mU)^" + packageName + " +(.*)$"
 	re := regexp.MustCompile(pattern)
 	match := re.FindStringSubmatch(string(output))
@@ -237,7 +211,7 @@
 func CallFakeUpdate(c *check.C) string {
 	c.Log("Preparing fake and calling update.")
 	fakeAvailableUpdate(c)
-	return ExecCommand(c, "sudo", "snappy", "update")
+	return cli.ExecCommand(c, "sudo", "snappy", "update")
 }
 
 func fakeAvailableUpdate(c *check.C) {
@@ -257,7 +231,7 @@
 			MakeWritable(c, target)
 			defer MakeReadonly(c, target)
 			// Back up the file. It will be restored during the test tear down.
-			ExecCommand(c, "cp", file, backup)
+			cli.ExecCommand(c, "cp", file, backup)
 			replaceSystemImageValues(c, file, "", "", strconv.Itoa(newVersion))
 		}
 	}
@@ -265,12 +239,12 @@
 
 // MakeWritable remounts a path with read and write permissions.
 func MakeWritable(c *check.C, path string) {
-	ExecCommand(c, "sudo", "mount", "-o", "remount,rw", path)
+	cli.ExecCommand(c, "sudo", "mount", "-o", "remount,rw", path)
 }
 
 // MakeReadonly remounts a path with only read permissions.
 func MakeReadonly(c *check.C, path string) {
-	ExecCommand(c, "sudo", "mount", "-o", "remount,ro", path)
+	cli.ExecCommand(c, "sudo", "mount", "-o", "remount,ro", path)
 }
 
 // Reboot requests a reboot using the test name as the mark.
@@ -346,10 +320,10 @@
 
 // InstallSnap executes the required command to install the specified snap
 func InstallSnap(c *check.C, packageName string) string {
-	return ExecCommand(c, "sudo", "snappy", "install", packageName, "--allow-unauthenticated")
+	return cli.ExecCommand(c, "sudo", "snappy", "install", packageName, "--allow-unauthenticated")
 }
 
 // RemoveSnap executes the required command to remove the specified snap
 func RemoveSnap(c *check.C, packageName string) string {
-	return ExecCommand(c, "sudo", "snappy", "remove", packageName)
+	return cli.ExecCommand(c, "sudo", "snappy", "remove", packageName)
 }
 
=== modified file '_integration-tests/testutils/common/info.go'
--- _integration-tests/testutils/common/info.go	2015-09-24 21:06:01 +0000
+++ _integration-tests/testutils/common/info.go	2015-10-02 10:23:57 +0000
@@ -24,10 +24,11 @@
 	"strings"
 
 	"gopkg.in/check.v1"
+	"launchpad.net/snappy/_integration-tests/testutils/cli"
 )
 
 // dependency aliasing
-var execCommand = ExecCommand
+var execCommand = cli.ExecCommand
 
 // Release returns the release of the current snappy image
 func Release(c *check.C) string {
 
=== modified file '_integration-tests/testutils/runner/runner.go'
--- _integration-tests/testutils/runner/runner.go	2015-08-12 15:50:33 +0000
+++ _integration-tests/testutils/runner/runner.go	2015-10-02 10:23:57 +0000
@@ -25,7 +25,7 @@
 	"strings"
 	"testing"
 
-	check "gopkg.in/check.v1"
+	"gopkg.in/check.v1"
 )
 
 var (
 
=== modified file '_integration-tests/testutils/wait/wait.go'
--- _integration-tests/testutils/wait/wait.go	2015-09-28 10:54:40 +0000
+++ _integration-tests/testutils/wait/wait.go	2015-10-02 10:23:57 +0000
@@ -24,14 +24,14 @@
 	"regexp"
 	"time"
 
-	check "gopkg.in/check.v1"
+	"gopkg.in/check.v1"
 
-	"launchpad.net/snappy/_integration-tests/testutils/common"
+	"launchpad.net/snappy/_integration-tests/testutils/cli"
 )
 
 var (
 	// dependency aliasing
-	execCommand = common.ExecCommand
+	execCommand = cli.ExecCommand
 	// ForCommand dep alias
 	ForCommand = forCommand
 	// ForFunction dep alias