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

[Federico Gimenez]

Changes in channel.ini are reverted after each test

Added call to revert the changes on system-image channel.ini; added redefinition of PATH for finding the test's binaries

[lp:~fgimenez/snappy/fix-failover-versions]

557. By Federico Gimenez on 2015-07-03

merged trunk

558. By Federico Gimenez on 2015-07-06

merged prerequisite

559. By Federico Gimenez on 2015-07-06

merged prerequisite

560. By Federico Gimenez on 2015-07-06

merged prerequisite

Unmerged revisions

=== modified file '_integration-tests/tests/failover/failover_rclocal_crash_test.go'
--- _integration-tests/tests/failover/failover_rclocal_crash_test.go	2015-06-29 15:57:03 +0000
+++ _integration-tests/tests/failover/failover_rclocal_crash_test.go	2015-07-03 15:39:51 +0000
@@ -24,12 +24,12 @@
 
 	. "../common"
 
-	. "gopkg.in/check.v1"
+	check "gopkg.in/check.v1"
 )
 
 type rcLocalCrash struct{}
 
-func (rcLocalCrash) set(c *C) {
+func (rcLocalCrash) set(c *check.C) {
 	makeWritable(c, baseOtherPath)
 	targetFile := fmt.Sprintf("%s/etc/rc.local", baseOtherPath)
 	ExecCommand(c, "sudo", "chmod", "a+xw", targetFile)
@@ -38,12 +38,12 @@
 	makeReadonly(c, baseOtherPath)
 }
 
-func (rcLocalCrash) unset(c *C) {
+func (rcLocalCrash) unset(c *check.C) {
 	makeWritable(c, baseOtherPath)
 	ExecCommand(c, "sudo", "rm", fmt.Sprintf("%s/etc/rc.local", baseOtherPath))
 	makeReadonly(c, baseOtherPath)
 }
 
-func (s *failoverSuite) TestRCLocalCrash(c *C) {
+func (s *failoverSuite) TestRCLocalCrash(c *check.C) {
 	commonFailoverTest(c, rcLocalCrash{})
 }

=== modified file '_integration-tests/tests/failover/failover_systemd_loop_test.go'
--- _integration-tests/tests/failover/failover_systemd_loop_test.go	2015-06-29 15:57:23 +0000
+++ _integration-tests/tests/failover/failover_systemd_loop_test.go	2015-07-03 15:39:51 +0000
@@ -24,7 +24,7 @@
 
 	. "../common"
 
-	. "gopkg.in/check.v1"
+	check "gopkg.in/check.v1"
 )
 
 const (
@@ -60,17 +60,17 @@
 
 type systemdDependencyLoop struct{}
 
-func (systemdDependencyLoop) set(c *C) {
+func (systemdDependencyLoop) set(c *check.C) {
 	installService(c, "deadlock", deadlockService, baseOtherPath)
 	installService(c, "emerg-reboot", rebootService, baseOtherPath)
 }
 
-func (systemdDependencyLoop) unset(c *C) {
+func (systemdDependencyLoop) unset(c *check.C) {
 	unInstallService(c, "deadlock", baseOtherPath)
 	unInstallService(c, "emerg-reboot", baseOtherPath)
 }
 
-func installService(c *C, serviceName, serviceCfg, basePath string) {
+func installService(c *check.C, serviceName, serviceCfg, basePath string) {
 	makeWritable(c, basePath)
 
 	// Create service file
@@ -93,7 +93,7 @@
 	makeReadonly(c, basePath)
 }
 
-func unInstallService(c *C, serviceName, basePath string) {
+func unInstallService(c *check.C, serviceName, basePath string) {
 	makeWritable(c, basePath)
 
 	// Disable the service
@@ -111,6 +111,6 @@
 	makeReadonly(c, basePath)
 }
 
-func (s *failoverSuite) TestSystemdDependencyLoop(c *C) {
+func (s *failoverSuite) TestSystemdDependencyLoop(c *check.C) {
 	commonFailoverTest(c, systemdDependencyLoop{})
 }

=== modified file '_integration-tests/tests/failover/failover_test.go'
--- _integration-tests/tests/failover/failover_test.go	2015-07-01 15:02:58 +0000
+++ _integration-tests/tests/failover/failover_test.go	2015-07-03 15:39:51 +0000
@@ -25,15 +25,15 @@
 	"path/filepath"
 	"testing"
 
+	check "gopkg.in/check.v1"
+
 	. "../common"
-
-	. "gopkg.in/check.v1"
 )
 
 // Hook up gocheck into the "go test" runner.
-func Test(t *testing.T) { TestingT(t) }
+func Test(t *testing.T) { check.TestingT(t) }
 
-var _ = Suite(&failoverSuite{})
+var _ = check.Suite(&failoverSuite{})
 
 type failoverSuite struct {
 	SnappySuite
@@ -47,21 +47,22 @@
 // The types that implement this interface can be used in the test logic
 type failer interface {
 	// Sets the failure conditions
-	set(c *C)
+	set(c *check.C)
 	// Unsets the failure conditions
-	unset(c *C)
+	unset(c *check.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) {
+func commonFailoverTest(c *check.C, f failer) {
 	currentVersion := GetCurrentVersion(c)
 
 	if AfterReboot(c) {
 		RemoveRebootMark(c)
+		defer switchChannelVersion(c, currentVersion, currentVersion+1)
 		f.unset(c)
-		c.Assert(GetSavedVersion(c), Equals, currentVersion)
+		c.Assert(GetSavedVersion(c), check.Equals, currentVersion)
 	} else {
 		switchChannelVersion(c, currentVersion, currentVersion-1)
 		SetSavedVersion(c, currentVersion-1)
@@ -71,7 +72,7 @@
 	}
 }
 
-func switchChannelVersion(c *C, oldVersion, newVersion int) {
+func switchChannelVersion(c *check.C, oldVersion, newVersion int) {
 	targets := []string{"/", baseOtherPath}
 	for _, target := range targets {
 		file := filepath.Join(target, channelCfgFile)
@@ -88,10 +89,10 @@
 	}
 }
 
-func makeWritable(c *C, path string) {
+func makeWritable(c *check.C, path string) {
 	ExecCommand(c, "sudo", "mount", "-o", "remount,rw", path)
 }
 
-func makeReadonly(c *C, path string) {
+func makeReadonly(c *check.C, path string) {
 	ExecCommand(c, "sudo", "mount", "-o", "remount,ro", path)
 }

=== modified file '_integration-tests/tests/failover/failover_zero_size_file_test.go'
--- _integration-tests/tests/failover/failover_zero_size_file_test.go	2015-06-29 15:52:59 +0000
+++ _integration-tests/tests/failover/failover_zero_size_file_test.go	2015-07-03 15:39:51 +0000
@@ -26,7 +26,7 @@
 
 	. "../common"
 
-	. "gopkg.in/check.v1"
+	check "gopkg.in/check.v1"
 )
 
 const (
@@ -43,31 +43,31 @@
 type zeroSizeInitrd struct{}
 type zeroSizeSystemd struct{}
 
-func (zeroSizeKernel) set(c *C) {
+func (zeroSizeKernel) set(c *check.C) {
 	commonSet(c, origBootFilenamePattern, kernelFilename)
 }
 
-func (zeroSizeKernel) unset(c *C) {
+func (zeroSizeKernel) unset(c *check.C) {
 	commonUnset(c, origBootFilenamePattern, kernelFilename)
 }
 
-func (zeroSizeInitrd) set(c *C) {
+func (zeroSizeInitrd) set(c *check.C) {
 	commonSet(c, origBootFilenamePattern, initrdFilename)
 }
 
-func (zeroSizeInitrd) unset(c *C) {
+func (zeroSizeInitrd) unset(c *check.C) {
 	commonUnset(c, origBootFilenamePattern, initrdFilename)
 }
 
-func (zeroSizeSystemd) set(c *C) {
+func (zeroSizeSystemd) set(c *check.C) {
 	commonSet(c, origSystemdFilenamePattern, systemdFilename)
 }
 
-func (zeroSizeSystemd) unset(c *C) {
+func (zeroSizeSystemd) unset(c *check.C) {
 	commonUnset(c, origSystemdFilenamePattern, systemdFilename)
 }
 
-func commonSet(c *C, origPattern, filename string) {
+func commonSet(c *check.C, origPattern, filename string) {
 	filenamePattern := fmt.Sprintf(origPattern, "", filename)
 	completePattern := filepath.Join(
 		baseOtherPath,
@@ -81,7 +81,7 @@
 	renameFile(c, baseOtherPath, oldFilename, newFilename)
 }
 
-func commonUnset(c *C, origPattern, filename string) {
+func commonUnset(c *check.C, origPattern, filename string) {
 	completePattern := filepath.Join(
 		baseOtherPath,
 		fmt.Sprintf(origPattern, destFilenamePrefix, filename))
@@ -91,32 +91,32 @@
 	renameFile(c, baseOtherPath, oldFilename, newFilename)
 }
 
-func renameFile(c *C, basePath, oldFilename, newFilename string) {
+func renameFile(c *check.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 {
+func getSingleFilename(c *check.C, pattern string) string {
 	matches, err := filepath.Glob(pattern)
 
-	c.Assert(err, IsNil, Commentf("Error: %v", err))
-	c.Assert(len(matches), Equals, 1)
+	c.Assert(err, check.IsNil, check.Commentf("Error: %v", err))
+	c.Assert(len(matches), check.Equals, 1)
 
 	return matches[0]
 }
 
 /*
-func (s *failoverSuite) TestZeroSizeKernel(c *C) {
+func (s *failoverSuite) TestZeroSizeKernel(c *check.C) {
 	commonFailoverTest(c, zeroSizeKernel{})
 }
 */
 
-func (s *failoverSuite) TestZeroSizeInitrd(c *C) {
+func (s *failoverSuite) TestZeroSizeInitrd(c *check.C) {
 	commonFailoverTest(c, zeroSizeInitrd{})
 }
 
-func (s *failoverSuite) TestZeroSizeSystemd(c *C) {
+func (s *failoverSuite) TestZeroSizeSystemd(c *check.C) {
 	commonFailoverTest(c, zeroSizeSystemd{})
 }