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

[Leo Arias]

Check the reboot message on update.

[Federico Gimenez (fgimenez)]

LGTM, thanks

review: Approve

[lp:~elopio/snappy/selftest-reboot-notice]

611. By Leo Arias on 2015-07-27

Fixed the regexp.

=== modified file '_integration-tests/helpers/common/common.go'
--- _integration-tests/helpers/common/common.go	2015-07-22 19:10:20 +0000
+++ _integration-tests/helpers/common/common.go	2015-07-27 14:31:49 +0000
@@ -226,10 +226,10 @@
 }
 
 // CallFakeUpdate calls snappy update after faking the current version
-func CallFakeUpdate(c *check.C) {
+func CallFakeUpdate(c *check.C) string {
 	c.Log("Preparing fake and calling update.")
 	fakeAvailableUpdate(c)
-	ExecCommand(c, "sudo", "snappy", "update")
+	return ExecCommand(c, "sudo", "snappy", "update")
 }
 
 func fakeAvailableUpdate(c *check.C) {

=== modified file '_integration-tests/tests/update_test.go'
--- _integration-tests/tests/update_test.go	2015-07-22 18:13:22 +0000
+++ _integration-tests/tests/update_test.go	2015-07-27 14:31:49 +0000
@@ -37,7 +37,11 @@
 // be up-to-date after running this test.
 func (s *updateSuite) TestUpdateToSameReleaseAndChannel(c *check.C) {
 	if BeforeReboot() {
-		CallFakeUpdate(c)
+		updateOutput := CallFakeUpdate(c)
+		expected := "(?ms)" +
+			".*" +
+			"^Reboot to use .*ubuntu-core.\n"
+		c.Assert(updateOutput, check.Matches, expected)
 		Reboot(c)
 	} else if AfterReboot(c) {
 		RemoveRebootMark(c)