Snappy

Merge lp:~elopio/snappy/expose-bug1498293-boot_try into lp:~snappy-dev/snappy/snappy-moved-to-github

  1. expose-bug1498293-boot_try
  2. Merge into snappy-moved-to-github
Proposed by Leo Arias
Status: Needs review
Proposed branch: lp:~elopio/snappy/expose-bug1498293-boot_try
Merge into: lp:~snappy-dev/snappy/snappy-moved-to-github
Prerequisite: lp:~elopio/snappy/wait-boot-ok
Diff against target: 13 lines (+3/-0)
1 file modified
_integration-tests/tests/update_test.go (+3/-0)
To merge this branch: bzr merge lp:~elopio/snappy/expose-bug1498293-boot_try
Reviewer Review Type Date Requested Status
Snappy Developers Pending
Review via email: mp+272996@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Leo Arias (elopio) wrote :

DO NOT MERGE until bug #1498293 is fixed.

Reply

Unmerged revisions

731. By Leo Arias

Added an assertion to expose bug #1498293: After boot, the bootloader mode is set to try.

730. By Leo Arias

Merged with prerequisite.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '_integration-tests/tests/update_test.go'
2--- _integration-tests/tests/update_test.go 2015-09-10 15:55:23 +0000
3+++ _integration-tests/tests/update_test.go 2015-09-30 22:43:50 +0000
4@@ -72,6 +72,9 @@
5 Reboot(c)
6 } else if AfterReboot(c) {
7 RemoveRebootMark(c)
8+ mode, err := partition.Mode()
9+ c.Assert(err, check.IsNil, check.Commentf("Error getting bootloader mode: %s", err))
10+ c.Assert(mode, check.Equals, "regular", check.Commentf("Wrong bootloader mode."))
11 c.Assert(GetCurrentUbuntuCoreVersion(c) > GetSavedVersion(c),
12 check.Equals, true)
13 }

Subscribers

People subscribed via source and target branches