Merge lp:~fgimenez/snappy/failover-tests into lp:~snappy-dev/snappy/snappy-moved-to-github

[Federico Gimenez]

Extended failover tests

Extended failover tests

[lp:~fgimenez/snappy/failover-tests]

528. By Federico Gimenez on 2015-06-23

Added comment for boot path depending on arch

529. By Federico Gimenez on 2015-06-23

merged trunk

[Leo Arias (elopio)]

Nicely done Federico. In particular, the SetUpTest to handle reboots, that looks nice.

review: Approve

[lp:~fgimenez/snappy/failover-tests]

530. By Federico Gimenez on 2015-06-26

merged lp:~elopio/snappy/failover-tests-merge-trunk

=== modified file '_integration-tests/README'
--- _integration-tests/README	2015-06-25 14:40:02 +0000
+++ _integration-tests/README	2015-06-26 07:39:36 +0000
@@ -1,6 +1,5 @@
 # Automatic testing for snappy
 
-
 ## qemu based x86 testing
 
 Run locally with:
@@ -20,4 +19,3 @@
 shell tests) with:
 
 $ go run _integration-test/main.go
-

=== modified file '_integration-tests/main.go'
--- _integration-tests/main.go	2015-06-25 16:10:28 +0000
+++ _integration-tests/main.go	2015-06-26 07:39:36 +0000
@@ -40,7 +40,6 @@
 	imageDir    = filepath.Join(baseDir, "image")
 	outputDir   = filepath.Join(baseDir, "output")
 	imageTarget = filepath.Join(imageDir, "snappy.img")
-	testFile    = filepath.Join(testsDir, "snappy.tests")
 )
 
 func execCommand(cmds ...string) {
@@ -56,7 +55,7 @@
 	fmt.Println("Building tests")
 	prepareTargetDir(testsDir)
 	execCommand("go", "test", "-c", "./_integration-tests/tests")
-	execCommand("mv", "tests.test", testFile)
+	os.Rename("tests.test", "snappy.tests")
 }
 
 func createImage(release, channel string) {
@@ -80,7 +79,6 @@
 		"--override-control", "debian/integration-tests/control",
 		"--built-tree", rootPath,
 		"--output-dir", outputDir,
-		fmt.Sprintf("--copy=%s:%s", testsDir, testsDir),
 		"---",
 		"ssh", "-s", "/usr/share/autopkgtest/ssh-setup/snappy",
 		"--", "-i", imageTarget)

=== removed file '_integration-tests/tests/80_test_failover'
--- _integration-tests/tests/80_test_failover	2015-06-15 15:36:29 +0000
+++ _integration-tests/tests/80_test_failover	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-# Test that we rollback on failed upgrades
-# (needs autopkgtest with a supporting runner).
-
-test() {
-    can_reboot || { echo "SKIP: cannot reboot testbed"; return; }
-
-    # debug
-    version_info
-    boot_info
-
-    if after_reboot; then
-        # reboot: ensure we booted back into original
-        orig_current=$(cat "${ADT_ARTIFACTS}/current")
-        if [ "$orig_current" != "$current" ]; then
-            fail "did not failover to good version (\"$orig_current\" != \"$current\")"
-        fi
-
-        # FIXME: grep log(other partition) for the crash to ensure it
-        #        really worked
-        # FIXME2: reboot again as regression test for #1449904
-
-        # we booted, cleanup the panic for the next tests to work
-        sudo mount -o remount,rw /writable/cache/system
-        sudo rm /writable/cache/system/etc/rc.local
-        return
-    fi
-
-    # fake new available version by doing a current--
-    switch_channel "s/build_number: $current/build_number: $((current-1))/" /etc/system-image/channel.ini
-
-    # we should have something now :)
-    version_info
-
-    [ $avail -gt $current ] || fail "$avail is not newer than $current"
-
-    # save version for post-upgrade test
-    save_version_info $avail $current
-
-    echo "upgrading..."
-    sudo snappy update
-
-    # break the upgrade by inserting a broken rc.local file onto the other
-    # partition
-    sudo mount -o remount,rw /writable/cache/system/
-    printf "#!/bin/sh\nprintf c > /proc/sysrq-trigger" | sudo tee /writable/cache/system/etc/rc.local
-    
-    reboot
-}

=== added file '_integration-tests/tests/common_test.go'
--- _integration-tests/tests/common_test.go	1970-01-01 00:00:00 +0000
+++ _integration-tests/tests/common_test.go	2015-06-26 07:39:36 +0000
@@ -0,0 +1,74 @@
+// -*- 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 tests
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"testing"
+
+	. "gopkg.in/check.v1"
+)
+
+type CommonSuite struct{}
+
+// Hook up gocheck into the "go test" runner
+func Test(t *testing.T) { TestingT(t) }
+
+func execCommand(c *C, cmds ...string) string {
+	cmd := exec.Command(cmds[0], cmds[1:len(cmds)]...)
+	output, err := cmd.CombinedOutput()
+	stringOutput := string(output)
+	c.Assert(err, IsNil, Commentf("Error: %v", stringOutput))
+	return stringOutput
+}
+
+func execCommandToFile(c *C, filename string, cmds ...string) {
+	cmd := exec.Command(cmds[0], cmds[1:len(cmds)]...)
+	outfile, err := os.Create(filename)
+	c.Assert(err, IsNil, Commentf("Error creating output file %s", filename))
+
+	defer outfile.Close()
+	cmd.Stdout = outfile
+
+	err = cmd.Run()
+	c.Assert(err, IsNil, Commentf("Error executing command '%v': %v", cmds, err))
+}
+
+func (s *CommonSuite) SetUpSuite(c *C) {
+	execCommand(c, "sudo", "systemctl", "stop", "snappy-autopilot.timer")
+	execCommand(c, "sudo", "systemctl", "disable", "snappy-autopilot.timer")
+}
+
+func (s *CommonSuite) SetUpTest(c *C) {
+	afterReboot := os.Getenv("ADT_REBOOT_MARK")
+
+	if afterReboot == "" {
+		c.Logf("****** Running %s", c.TestName())
+	} else {
+		if afterReboot == c.TestName() {
+			c.Logf("****** Resuming %s after reboot", c.TestName())
+		} else {
+			c.Skip(fmt.Sprintf("****** Skipped %s after reboot caused by %s",
+				c.TestName(), afterReboot))
+		}
+	}
+}

=== added file '_integration-tests/tests/failover_rclocal_crash_test.go'
--- _integration-tests/tests/failover_rclocal_crash_test.go	1970-01-01 00:00:00 +0000
+++ _integration-tests/tests/failover_rclocal_crash_test.go	2015-06-26 07:39:36 +0000
@@ -0,0 +1,47 @@
+// -*- 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 tests
+
+import (
+	"fmt"
+
+	. "gopkg.in/check.v1"
+)
+
+type rcLocalCrash struct{}
+
+func (rcLocalCrash) set(c *C) {
+	makeWritable(c, baseOtherPath)
+	targetFile := fmt.Sprintf("%s/etc/rc.local", baseOtherPath)
+	execCommand(c, "sudo", "chmod", "a+xw", targetFile)
+	execCommandToFile(c, targetFile,
+		"sudo", "echo", "#!bin/sh\nprintf c > /proc/sysrq-trigger")
+	makeReadonly(c, baseOtherPath)
+}
+
+func (rcLocalCrash) unset(c *C) {
+	makeWritable(c, baseOtherPath)
+	execCommand(c, "sudo", "rm", fmt.Sprintf("%s/etc/rc.local", baseOtherPath))
+	makeReadonly(c, baseOtherPath)
+}
+
+func (s *FailoverSuite) TestRCLocalCrash(c *C) {
+	commonFailoverTest(c, rcLocalCrash{})
+}

=== added file '_integration-tests/tests/failover_systemd_loop_test.go'
--- _integration-tests/tests/failover_systemd_loop_test.go	1970-01-01 00:00:00 +0000
+++ _integration-tests/tests/failover_systemd_loop_test.go	2015-06-26 07:39:36 +0000
@@ -0,0 +1,114 @@
+// -*- 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 tests
+
+import (
+	"fmt"
+
+	. "gopkg.in/check.v1"
+)
+
+const (
+	deadlockService = `[Unit]
+Before=sysinit.target
+DefaultDependencies=no
+
+[Service]
+Type=oneshot
+ExecStartPre=-/bin/sh -c "echo 'DEBUG: $(date): deadlocked system' >/dev/console"
+ExecStartPre=-/bin/sh -c "echo 'DEBUG: $(date): deadlocked system' >/dev/ttyS0"
+ExecStart=/bin/systemctl start deadlock.service
+RemainAfterExit=yes
+
+[Install]
+RequiredBy=sysinit.target
+`
+	rebootService = `[Unit]
+DefaultDependencies=no
+Description=Hack to force reboot if booting did not finish after 20s
+
+[Service]
+Type=oneshot
+ExecStartPre=/bin/sleep 20
+ExecStart=-/bin/sh -c 'if ! systemctl is-active default.target; then wall "EMERGENCY REBOOT"; reboot -f; fi'
+
+[Install]
+RequiredBy=sysinit.target
+`
+	baseSystemdPath          = "/lib/systemd/system"
+	systemdTargetRequiresDir = "sysinit.target.requires"
+)
+
+type systemdDependencyLoop struct{}
+
+func (systemdDependencyLoop) set(c *C) {
+	installService(c, "deadlock", deadlockService, baseOtherPath)
+	installService(c, "emerg-reboot", rebootService, baseOtherPath)
+}
+
+func (systemdDependencyLoop) unset(c *C) {
+	unInstallService(c, "deadlock", baseOtherPath)
+	unInstallService(c, "emerg-reboot", baseOtherPath)
+}
+
+func installService(c *C, serviceName, serviceCfg, basePath string) {
+	makeWritable(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)
+
+	// Create requires directory
+	requiresDirPart := fmt.Sprintf("%s/%s", baseSystemdPath, systemdTargetRequiresDir)
+	requiresDir := fmt.Sprintf("%s%s", basePath, requiresDirPart)
+	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",
+		fmt.Sprintf("%s/%s.service", baseSystemdPath, serviceName),
+		fmt.Sprintf("%s/%s.service", requiresDirPart, serviceName),
+	)
+
+	makeReadonly(c, basePath)
+}
+
+func unInstallService(c *C, serviceName, basePath string) {
+	makeWritable(c, basePath)
+
+	// Disable the service
+	execCommand(c, "sudo", "chroot", basePath,
+		"systemctl", "disable", fmt.Sprintf("%s.service", serviceName))
+
+	// Remove the service file
+	execCommand(c, "sudo", "rm",
+		fmt.Sprintf("%s%s/%s.service", basePath, baseSystemdPath, serviceName))
+
+	// Remove the requires symlink
+	execCommand(c, "sudo", "rm",
+		fmt.Sprintf("%s%s/%s/%s.service", basePath, baseSystemdPath, systemdTargetRequiresDir, serviceName))
+
+	makeReadonly(c, basePath)
+}
+
+func (s *FailoverSuite) TestSystemdDependencyLoop(c *C) {
+	commonFailoverTest(c, systemdDependencyLoop{})
+}

=== added file '_integration-tests/tests/failover_test.go'
--- _integration-tests/tests/failover_test.go	1970-01-01 00:00:00 +0000
+++ _integration-tests/tests/failover_test.go	2015-06-26 07:39:36 +0000
@@ -0,0 +1,151 @@
+// -*- 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 tests
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strconv"
+	"strings"
+
+	. "gopkg.in/check.v1"
+)
+
+type FailoverSuite struct {
+	CommonSuite
+}
+
+var _ = Suite(&FailoverSuite{})
+
+const (
+	baseOtherPath  = "/writable/cache/system"
+	channelCfgFile = "/etc/system-image/channel.ini"
+)
+
+// The types that implement this interface can be used in the test logic
+type failer interface {
+	// Sets the failure conditions
+	set(c *C)
+	// Unsets the failure conditions
+	unset(c *C)
+}
+
+// This is the logic common to all the failover tests. Each of them has define a
+// type implementing the failer interface and call this function with an instance
+// of it
+func commonFailoverTest(c *C, f failer) {
+	currentVersion := getCurrentVersion(c)
+
+	if afterReboot(c) {
+		removeRebootMark(c)
+		f.unset(c)
+		c.Assert(getSavedVersion(c), Equals, currentVersion)
+	} else {
+		switchChannelVersion(c, currentVersion, currentVersion-1)
+		setSavedVersion(c, currentVersion-1)
+
+		callUpdate(c)
+		f.set(c)
+		reboot(c)
+	}
+}
+
+func reboot(c *C) {
+	// This will write the name of the current test as a reboot mark
+	execCommand(c, "sudo", "/tmp/autopkgtest-reboot", c.TestName())
+}
+
+func removeRebootMark(c *C) {
+	err := os.Setenv("ADT_REBOOT_MARK", "")
+	c.Assert(err, IsNil, Commentf("Error unsetting ADT_REBOOT_MARK"))
+}
+
+func afterReboot(c *C) bool {
+	// $ADT_REBOOT_MARK contains the reboot mark, if we have rebooted it'll be the test name
+	return os.Getenv("ADT_REBOOT_MARK") == c.TestName()
+}
+
+func getCurrentVersion(c *C) int {
+	output := execCommand(c, "snappy", "list")
+	pattern := "(?mU)^ubuntu-core (.*)$"
+	re := regexp.MustCompile(pattern)
+	match := re.FindStringSubmatch(output)
+	c.Assert(match, NotNil, Commentf("Version not found in %s", output))
+
+	// match is like "ubuntu-core   2015-06-18 93        ubuntu"
+	items := strings.Fields(match[0])
+	version, err := strconv.Atoi(items[2])
+	c.Assert(err, IsNil, Commentf("Error converting version to int %v", version))
+	return version
+}
+
+func setSavedVersion(c *C, version int) {
+	versionFile := getVersionFile()
+	err := ioutil.WriteFile(versionFile, []byte(strconv.Itoa(version)), 0777)
+	c.Assert(err, IsNil, Commentf("Error writing version file %s with %s", versionFile, version))
+}
+
+func getSavedVersion(c *C) int {
+	versionFile := getVersionFile()
+	contents, err := ioutil.ReadFile(versionFile)
+	c.Assert(err, IsNil, Commentf("Error reading version file %s", versionFile))
+
+	version, err := strconv.Atoi(string(contents))
+	c.Assert(err, IsNil, Commentf("Error converting version %v", contents))
+
+	return version
+}
+
+func getVersionFile() string {
+	return filepath.Join(os.Getenv("ADT_ARTIFACTS"), "version")
+}
+
+func switchChannelVersion(c *C, oldVersion, newVersion int) {
+	targets := []string{"/", baseOtherPath}
+	for _, target := range targets {
+		file := filepath.Join(target, channelCfgFile)
+		if _, err := os.Stat(file); err == nil {
+			makeWritable(c, target)
+			execCommand(c,
+				"sudo", "sed", "-i",
+				fmt.Sprintf(
+					"s/build_number: %d/build_number: %d/g",
+					oldVersion, newVersion),
+				file)
+			makeReadonly(c, target)
+		}
+	}
+}
+
+func callUpdate(c *C) {
+	c.Log("Calling snappy update...")
+	execCommand(c, "sudo", "snappy", "update")
+}
+
+func makeWritable(c *C, path string) {
+	execCommand(c, "sudo", "mount", "-o", "remount,rw", path)
+}
+
+func makeReadonly(c *C, path string) {
+	execCommand(c, "sudo", "mount", "-o", "remount,ro", path)
+}

=== added file '_integration-tests/tests/failover_zero_size_file_test.go'
--- _integration-tests/tests/failover_zero_size_file_test.go	1970-01-01 00:00:00 +0000
+++ _integration-tests/tests/failover_zero_size_file_test.go	2015-06-26 07:39:36 +0000
@@ -0,0 +1,120 @@
+// -*- 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 tests
+
+import (
+	"fmt"
+	"path/filepath"
+	"strings"
+
+	. "gopkg.in/check.v1"
+)
+
+const (
+	// TODO: take into account arch for the boot path pattern
+	origBootFilenamePattern    = "boot/%s%s*"
+	origSystemdFilenamePattern = "lib/systemd/%s%s"
+	kernelFilename             = "vmlinuz"
+	initrdFilename             = "initrd"
+	systemdFilename            = "systemd"
+	destFilenamePrefix         = "snappy-selftest-"
+)
+
+type zeroSizeKernel struct{}
+type zeroSizeInitrd struct{}
+type zeroSizeSystemd struct{}
+
+func (zeroSizeKernel) set(c *C) {
+	commonSet(c, origBootFilenamePattern, kernelFilename)
+}
+
+func (zeroSizeKernel) unset(c *C) {
+	commonUnset(c, origBootFilenamePattern, kernelFilename)
+}
+
+func (zeroSizeInitrd) set(c *C) {
+	commonSet(c, origBootFilenamePattern, initrdFilename)
+}
+
+func (zeroSizeInitrd) unset(c *C) {
+	commonUnset(c, origBootFilenamePattern, initrdFilename)
+}
+
+func (zeroSizeSystemd) set(c *C) {
+	commonSet(c, origSystemdFilenamePattern, systemdFilename)
+}
+
+func (zeroSizeSystemd) unset(c *C) {
+	commonUnset(c, origSystemdFilenamePattern, systemdFilename)
+}
+
+func commonSet(c *C, origPattern, filename string) {
+	filenamePattern := fmt.Sprintf(origPattern, "", filename)
+	completePattern := filepath.Join(
+		baseOtherPath,
+		filenamePattern)
+	oldFilename := getSingleFilename(c, completePattern)
+	filenameSuffix := fmt.Sprintf(
+		strings.Replace(origPattern, "*", "", 1), destFilenamePrefix, filepath.Base(oldFilename))
+	newFilename := fmt.Sprintf(
+		"%s/%s", baseOtherPath, filenameSuffix)
+
+	renameFile(c, baseOtherPath, oldFilename, newFilename)
+}
+
+func commonUnset(c *C, origPattern, filename string) {
+	completePattern := filepath.Join(
+		baseOtherPath,
+		fmt.Sprintf(origPattern, destFilenamePrefix, filename))
+	oldFilename := getSingleFilename(c, completePattern)
+	newFilename := strings.Replace(oldFilename, destFilenamePrefix, "", 1)
+
+	renameFile(c, baseOtherPath, oldFilename, newFilename)
+}
+
+func renameFile(c *C, basePath, oldFilename, newFilename string) {
+	makeWritable(c, basePath)
+	execCommand(c, "sudo", "mv", oldFilename, newFilename)
+	execCommand(c, "sudo", "touch", oldFilename)
+	makeReadonly(c, basePath)
+}
+
+func getSingleFilename(c *C, pattern string) string {
+	matches, err := filepath.Glob(pattern)
+
+	c.Assert(err, IsNil, Commentf("Error: %v", err))
+	c.Assert(len(matches), Equals, 1)
+
+	return matches[0]
+}
+
+/*
+func (s *FailoverSuite) TestZeroSizeKernel(c *C) {
+	commonFailoverTest(c, zeroSizeKernel{})
+}
+*/
+
+func (s *FailoverSuite) TestZeroSizeInitrd(c *C) {
+	commonFailoverTest(c, zeroSizeInitrd{})
+}
+
+func (s *FailoverSuite) TestZeroSizeSystemd(c *C) {
+	commonFailoverTest(c, zeroSizeSystemd{})
+}

=== renamed file '_integration-tests/tests/snappy_test.go' => '_integration-tests/tests/install_test.go'
--- _integration-tests/tests/snappy_test.go	2015-06-25 14:50:18 +0000
+++ _integration-tests/tests/install_test.go	2015-06-26 07:39:36 +0000
@@ -19,42 +19,24 @@
 
 package tests
 
-import (
-	"os/exec"
-	"testing"
-
-	. "gopkg.in/check.v1"
-)
-
-// Hook up gocheck into the "go test" runner
-func Test(t *testing.T) { TestingT(t) }
+import . "gopkg.in/check.v1"
 
 var _ = Suite(&InstallSuite{})
 
-type InstallSuite struct{}
-
-func (s *InstallSuite) installSnap(c *C, packageName string) string {
-	return s.execCommand(c, "sudo", "snappy", "install", packageName)
-}
-
-func (s *InstallSuite) execCommand(c *C, cmds ...string) string {
-	cmd := exec.Command(cmds[0], cmds[1:]...)
-	output, err := cmd.CombinedOutput()
-	stringOutput := string(output)
-	c.Assert(err, IsNil, Commentf("Error: %v", stringOutput))
-	return stringOutput
-}
-
-func (s *InstallSuite) SetUpSuite(c *C) {
-	s.execCommand(c, "sudo", "systemctl", "stop", "snappy-autopilot.timer")
+type InstallSuite struct {
+	CommonSuite
+}
+
+func installSnap(c *C, packageName string) string {
+	return execCommand(c, "sudo", "snappy", "install", packageName)
 }
 
 func (s *InstallSuite) TearDownTest(c *C) {
-	s.execCommand(c, "sudo", "snappy", "remove", "hello-world")
+	execCommand(c, "sudo", "snappy", "remove", "hello-world")
 }
 
 func (s *InstallSuite) TestInstallSnapMustPrintPackageInformation(c *C) {
-	installOutput := s.installSnap(c, "hello-world")
+	installOutput := installSnap(c, "hello-world")
 
 	expected := "" +
 		"Installing hello-world\n" +
@@ -66,18 +48,19 @@
 }
 
 func (s *InstallSuite) TestCallBinaryFromInstalledSnap(c *C) {
-	s.installSnap(c, "hello-world")
+	installSnap(c, "hello-world")
 
-	echoOutput := s.execCommand(c, "hello-world.echo")
+	echoOutput := execCommand(c, "hello-world.echo")
 
 	c.Assert(echoOutput, Equals, "Hello World!\n")
 }
 
 func (s *InstallSuite) TestInfoMustPrintInstalledPackageInformation(c *C) {
-	s.installSnap(c, "hello-world")
+	installSnap(c, "hello-world")
 
-	infoOutput := s.execCommand(c, "snappy", "info")
+	infoOutput := execCommand(c, "snappy", "info")
 
 	expected := "(?ms).*^apps: hello-world\n"
+
 	c.Assert(infoOutput, Matches, expected)
 }

=== modified file 'debian/integration-tests/control'
--- debian/integration-tests/control	2015-06-25 12:09:04 +0000
+++ debian/integration-tests/control	2015-06-26 07:39:36 +0000
@@ -1,4 +1,4 @@
-Test-Command: /tmp/snappy-test/tests/snappy.tests -gocheck.vv -test.outputdir=$ADT_ARTIFACTS
+Test-Command: ./snappy.tests -gocheck.vv -test.outputdir=$ADT_ARTIFACTS
 Restrictions: allow-stderr
 Depends: ubuntu-snappy-tests