Merge lp:~fgimenez/snappy/failover-with-fake-update into lp:~snappy-dev/snappy/snappy-moved-to-github

[Federico Gimenez]

Always use fake update for failover.

Always use fake update for failover.

If we are using one image with an already available update (for instance, when validating the RC), the current CallUpdate method first does the update and, if didn't returned anything, the fake update.

Then, depending on the availability of an actual update the failover tests after the successful reboot can end on the current version (there was an update available and we didn't the fake) or the current version minus one (there wasn't an available update and we did the fake).

Because we cannot control the availability of an update to have a controlled state we should do always a fake update, moreover we are not testing here the update itself, but the failover capabilities.

[Leo Arias (elopio)]

I don't want to delay this anymore. Looks good, and having more control over the tests makes a lot of sense.

review: Approve

[Leo Arias (elopio)]

ok, I finally got to see this running after enabling the whole suite in the other branch. Land land land!

=== modified file '_integration-tests/tests/common/common.go'
--- _integration-tests/tests/common/common.go	2015-07-08 09:10:26 +0000
+++ _integration-tests/tests/common/common.go	2015-07-09 10:11:40 +0000
@@ -171,11 +171,17 @@
 	// if there is an available update. --elopio - 2015-07-01
 	if output == "" {
 		c.Log("There is no update available.")
-		fakeAvailableUpdate(c)
-		ExecCommand(c, "sudo", "snappy", "update")
+		CallFakeUpdate(c)
 	}
 }
 
+// CallFakeUpdate calls snappy update after faking the current version
+func CallFakeUpdate(c *check.C) {
+	c.Log("Preparing fake and calling update.")
+	fakeAvailableUpdate(c)
+	ExecCommand(c, "sudo", "snappy", "update")
+}
+
 func fakeAvailableUpdate(c *check.C) {
 	c.Log("Faking an available update...")
 	currentVersion := GetCurrentVersion(c)

=== modified file '_integration-tests/tests/failover/failover_test.go'
--- _integration-tests/tests/failover/failover_test.go	2015-07-07 04:22:56 +0000
+++ _integration-tests/tests/failover/failover_test.go	2015-07-09 10:11:40 +0000
@@ -56,7 +56,7 @@
 		c.Assert(GetSavedVersion(c), check.Equals, currentVersion)
 	} else {
 		SetSavedVersion(c, currentVersion-1)
-		CallUpdate(c)
+		CallFakeUpdate(c)
 		f.set(c)
 		Reboot(c)
 	}