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

[Brendan Donegan]

For some reason the show_tree function in qt_interface.py did not sort the dictionary of items to be displayed in the test selection tree, so the order would be random as expected from a Python dictionary.

Simply sorting the list of items causes the tests to be shown in order at the test selection view. Note that this will always be alphabetical order, and has nothing to do with the order of the tests in the whitelist.

[Zygmunt Krynicki (zyga)]

Looks good. I'll give it some testing and land it. Thanks

[Zygmunt Krynicki (zyga)]

+1

review: Approve

=== modified file 'checkbox-old/checkbox_qt/qt_interface.py'
--- checkbox-old/checkbox_qt/qt_interface.py	2013-06-03 15:00:37 +0000
+++ checkbox-old/checkbox_qt/qt_interface.py	2013-06-12 10:54:29 +0000
@@ -147,7 +147,7 @@
 
         def buildBranch(options, default, baseIndex="1"):
             internalIndex = 1
-            for test, state in options.items():
+            for test, state in sorted(options.items()):
                 active = test in default
                 if isinstance(state, dict):
                     indexedOptions[

=== modified file 'checkbox-old/debian/changelog'
--- checkbox-old/debian/changelog	2013-06-11 16:26:40 +0000
+++ checkbox-old/debian/changelog	2013-06-12 10:54:29 +0000
@@ -23,6 +23,8 @@
   * jobs/touchpad.txt.in - Remove the requires line for touch_mode in
     touchpad/horizontal and touchpad/vertical so that those tests will
     at least run on those systems where they are supposed to (LP: #1184882)
+  * checkbox_qt/qt_interface.py - Order the list of items to be displayed
+    alphabetically, so the order is consistent (LP: #1177647)
 
   [ Daniel Manrique ]
   * jobs/stress.txt.in: fixed a few inconsistent invocations of sleep_test.