Merge lp:~brendan-donegan/checkbox/reset_suite_selections into lp:checkbox

Proposed by Brendan Donegan
Status: Merged
Merged at revision: 1076
Proposed branch: lp:~brendan-donegan/checkbox/reset_suite_selections
Merge into: lp:checkbox
Diff against target: 24 lines (+4/-0)
2 files modified
debian/changelog (+1/-0)
plugins/suites_prompt.py (+3/-0)
To merge this branch: bzr merge lp:~brendan-donegan/checkbox/reset_suite_selections
Reviewer Review Type Date Requested Status
Marc Tardif (community) Approve
Review via email: mp+77334@code.launchpad.net

Description of the change

In the begin_recover handler function of the suite_prompt plugin I removed the 'default' attribute from the persistent storage so that the selections would be reset in the test suite selection screen. I've tested this with both selecting Yes, where the test selection screen is skipped (by design) and the test run resumes from where we left off and with No, where the test selection screen reverts to having all tests selected by default and starts from the first test (not the last test run)

To post a comment you must log in.
Revision history for this message
Marc Tardif (cr3) wrote :

Looks beautiful, merging.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-09-27 09:10:35 +0000
3+++ debian/changelog 2011-09-28 14:36:28 +0000
4@@ -8,6 +8,7 @@
5 minimum_resolution test to fail (LP: #855599)
6 * Remove storage_devices_test from Ubuntu Friendly whitelist since bonnie++ (which it uses) is not installed by default (LP: #855841)
7 * Changed description and name to reflect Ubuntu Friendly branding. Now when a user searches for Ubuntu Friendly in the lens, Checkbox will appear (LP: #852036)
8+ * Reset the selections at the test suite prompt if No is selected at the recover prompt (LP: #861208)
9
10 [Daniel Manrique]
11 * Restored _recover attribute, re-enabling welcome and test selection
12
13=== modified file 'plugins/suites_prompt.py'
14--- plugins/suites_prompt.py 2011-09-19 19:47:38 +0000
15+++ plugins/suites_prompt.py 2011-09-28 14:36:28 +0000
16@@ -63,6 +63,9 @@
17 def begin_recover(self, recover):
18 self._recover = recover
19
20+ if not self._recover:
21+ self.persist.remove("default")
22+
23 def report_suite(self, suite):
24 suite.setdefault("type", "suite")
25

Subscribers

People subscribed via source and target branches