Merge lp:~elopio/snappy/test_go_rollback into lp:~snappy-dev/snappy/snappy-moved-to-github

[Leo Arias]

Added an integration test for a fake rollback. Removed the shell test that used to do it.

[Federico Gimenez (fgimenez)]

Nice +1, I'm getting the following error from one of the remaining shell tests, probably expected:

****** Running ./_integration-tests/tests/91_test_upgrade_from_stable_image
current version: 110
available version: 110
Boot order
set cmdline="root=LABEL=$label ro init=/lib/systemd/systemd console=ttyS0 console=tty1 panic=-1"
snappy_mode=regular
snappy_ab=a
---
current version: 110
available version: 110
ERROR 110 is not newer than 110
FAILED: ./_integration-tests/tests/91_test_upgrade_from_stable_image

review: Approve

[lp:~elopio/snappy/test_go_rollback]

588. By Leo Arias on 2015-07-17

Also remove the dependent 91 test.

[Leo Arias (elopio)]

Thanks for catching that.

<elopio> fgimenez: ugh, that 91 tests depends on the 90 test. Are you ok if I just remove both?
<fgimenez> elopio, sure
<elopio> 91 in this case will just do a fake update, which we already have. And the 15.04_to_rolling branch fully replaces 91.
<fgimenez> elopio, yes, it's already covered

=== removed file '_integration-tests/tests/90_test_upgrade'
--- _integration-tests/tests/90_test_upgrade	2015-06-15 15:36:29 +0000
+++ _integration-tests/tests/90_test_upgrade	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-# Test that we can upgrade to the latest image version and roll back to the
-# original version. Test will be skipped the testbed does not offer reboot
-# (needs autopkgtest with a supporting runner).
-
-test() {
-    can_reboot || { echo "SKIP: cannot reboot testbed"; return; }
-
-    # debug
-    version_info    
-    boot_info
-
-    if after_reboot; then
-        # second reboot: after rollback
-        if [ -e "${ADT_ARTIFACTS}/rolled_back" ]; then
-            orig_current=$(cat "${ADT_ARTIFACTS}/current")
-            [ "$orig_current" = "$current" ] || fail "did not roll back to version $orig_current ($all_versions)"
-            return
-        fi
-
-        # first reboot: after upgrade
-        orig_avail=$(cat "${ADT_ARTIFACTS}/avail")
-        [ "$orig_avail" = "$current" ] || fail "did not upgrade to current version $orig_avail != $current ($all_versions)"
-
-        echo "rolling back..."
-        sudo snappy rollback ubuntu-core
-        touch "${ADT_ARTIFACTS}/rolled_back"
-        reboot
-        return
-    fi
-
-    # fake new available version by doing a current--
-    switch_channel "s/build_number: $current/build_number: $((current-1))/"
-
-    # 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
-    reboot
-}

=== removed file '_integration-tests/tests/91_test_upgrade_from_stable_image'
--- _integration-tests/tests/91_test_upgrade_from_stable_image	2015-06-15 15:36:29 +0000
+++ _integration-tests/tests/91_test_upgrade_from_stable_image	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-# Test that we can upgrade from the latest *stable* image version to the
-# current edge image version and rollback original version.
-#
-# Make image for this with:
-#
-# $ sudo ubuntu-device-flash core  --channel=stable 15.04 -o snappy-stable.img --developer-mode --enable-ssh
-#
-# Run with:
-# adt-run upgrade-test/ --- ssh -s snappy -- -i /path/to/snappy-stable.img
-
-test() {
-    can_reboot || { echo "SKIP: cannot reboot testbed"; return; }
-
-    # debug
-    version_info    
-    boot_info
-
-    if after_reboot; then
-        # second reboot: after rollback
-        if [ -e "${ADT_ARTIFACTS}/rolled_back-stable" ]; then
-            orig_current=$(cat "${ADT_ARTIFACTS}/current")
-            [ "$orig_current" = "$current" ] || fail "did not roll back to version $orig_current ($all_versions)"
-            return
-        fi
-
-        # first reboot: after upgrade
-        orig_avail=$(cat "${ADT_ARTIFACTS}/avail")
-        [ "$orig_avail" = "$current" ] || fail "did not upgrade to current version ($all_versions)"
-
-        echo "rolling back..."
-        sudo snappy rollback ubuntu-core
-        touch "${ADT_ARTIFACTS}/rolled_back-stable"
-        reboot
-        return
-    fi
-
-    # switch channel
-    switch_channel 's#channel: ubuntu-core/\(.*\)/stable#channel: ubuntu-core/\1/edge#'
-    
-    # now upgrade to latest edge from stable
-    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
-    reboot
-}

=== modified file '_integration-tests/tests/common/common.go'
--- _integration-tests/tests/common/common.go	2015-07-16 00:12:27 +0000
+++ _integration-tests/tests/common/common.go	2015-07-17 15:34:51 +0000
@@ -254,7 +254,7 @@
 // rebooted.
 func AfterReboot(c *check.C) bool {
 	// $ADT_REBOOT_MARK contains the reboot mark, if we have rebooted it'll be the test name
-	return CheckRebootMark(c.TestName())
+	return strings.HasPrefix(os.Getenv("ADT_REBOOT_MARK"), c.TestName())
 }
 
 // CheckRebootMark returns True if the reboot mark matches the string passed as

=== added file '_integration-tests/tests/latest/rollback_test.go'
--- _integration-tests/tests/latest/rollback_test.go	1970-01-01 00:00:00 +0000
+++ _integration-tests/tests/latest/rollback_test.go	2015-07-17 15:34:51 +0000
@@ -0,0 +1,52 @@
+// -*- 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 latest
+
+import (
+	"strconv"
+
+	. "../common"
+	check "gopkg.in/check.v1"
+)
+
+var _ = check.Suite(&rollbackSuite{})
+
+type rollbackSuite struct {
+	SnappySuite
+}
+
+func (s *rollbackSuite) TestRollbackMustRebootToOtherVersion(c *check.C) {
+	if BeforeReboot() {
+		CallFakeUpdate(c)
+		Reboot(c)
+	} else if CheckRebootMark(c.TestName()) {
+		RemoveRebootMark(c)
+		currentVersion := GetCurrentUbuntuCoreVersion(c)
+		c.Assert(currentVersion, check.Equals, GetSavedVersion(c)+1)
+		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)
+		c.Assert(
+			GetCurrentUbuntuCoreVersion(c), check.Equals, GetSavedVersion(c)-1)
+	}
+}