Merge lp:~mterry/snappy/selftest-reboot-notice into lp:~snappy-dev/snappy/snappy-moved-to-github

[Michael Terry]

Add a test to make sure we print reboot notices after update and rollback, if needed.

Add a test to make sure we print reboot notices after update and rollback, if needed.

A while back, I added a reboot notification to 'snappy rollback' [1]. It didn't have any tests though. It seemed like a better candidate for integration tests than unit tests, but selftests weren't integrated at the time.

I've been sitting on this test and realized I should propose it! So here it is.

[1] https://code.launchpad.net/~mterry/snappy/rollback-reboot/+merge/261114

[Sergio Schvezov (sergiusens)]

this looks good, but would need a conditional skip if the "device" (kernel/os) has been sideloaded.

[Leo Arias (elopio)]

I've finally been able to test it. I'm ok with this as is because the test script controls how the kvm is provisioned and it has nothing sideloaded. Once we start making the tests without fakes, this one needs to be part of the suite that sets up an available update. And maybe we should add another to the suite with that prepares a sideloaded image.

****** Running ./tests/12_test_reboot_notice
current version: 84
available version: 84
Rebooting testbed...
[...]
****** Resuming ./tests/12_test_reboot_notice after reboot
****** Running ./tests/80_test_failover

[...]
echo "All good, what could possibly go wrong"
All good, what could possibly go wrong

review: Approve

[Snappy Tarmac (snappydevtarmac)]

Attempt to merge into lp:snappy failed due to conflicts:

missing parent in _integration-tests/run-in-image
unversioned parent in _integration-tests/run-in-image
missing parent in _integration-tests/run-in-image/tests
unversioned parent in _integration-tests/run-in-image/tests

[Leo Arias (elopio)]

stop, hammertime!

this needs to be translated into go, we no longer have the shell test suite. It's esasy, I'll get to it tomorrow.

review: Needs Fixing

[Leo Arias (elopio)]

Rejecting in favor of this one: https://code.launchpad.net/~elopio/snappy/selftest-reboot-notice/+merge/265853

Unmerged revisions

513. By Michael Terry on 2015-06-17

Add an integration test to make sure we print reboot notices

=== added file 'integration-tests/run-in-image/tests/12_test_reboot_notice'
--- integration-tests/run-in-image/tests/12_test_reboot_notice	1970-01-01 00:00:00 +0000
+++ integration-tests/run-in-image/tests/12_test_reboot_notice	2015-06-17 19:41:22 +0000
@@ -0,0 +1,25 @@
+# Test that we notify the user to reboot after operations that need it.
+# 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; }
+
+    # Could be either "the new ubuntu-core" or "ubuntu-core version XX".
+    # Either is fine, we just want the user notified.
+    T="Reboot to use.*ubuntu-core"
+
+    if after_reboot; then
+        test_regexp "$T" sudo $SNAPPY rollback ubuntu-core
+        test_regexp "$T" sudo $SNAPPY list
+        return
+    fi
+
+    # fake new available version by doing a current--
+    version_info
+    switch_channel "s/build_number: $current/build_number: $((current-1))/"
+
+    test_regexp "$T" sudo $SNAPPY update ubuntu-core
+    test_regexp "$T" sudo $SNAPPY list
+    reboot
+}