Merge lp:~oem-qa/checkbox/patch_deselect_ancestors_when_no_child_is_selected into lp:checkbox

[Javier Collado]

This branch implements a small enhancement to deselect a test suite automatically when no other child is selected for the GTK interface.

The aim of the change is to prevent just a test suite from being selected because it might be confusing to the user (he might think something has been selected, but no tests where executed later).

[lp:~oem-qa/checkbox/patch_deselect_ancestors_when_no_child_is_selected]

859. By Marc Tardif on 2010-11-25

Merged from cli_no_answer branch.

860. By Marc Tardif on 2010-11-29

Changed connection request back to use the full url instead rather than the path.

861. By Marc Tardif on 2010-12-08

Replaced external plugin with remote plugin in autotest and ltp scripts.

862. By Marc Tardif on 2010-12-10

Merged from testsprint-checkbox-base-sru-changes.

[Javier Collado (javier.collado)]

Please let me know if there's any problem with this merge proposal.

It actually fixes a small bug so I think it would be good to merge this change.

[lp:~oem-qa/checkbox/patch_deselect_ancestors_when_no_child_is_selected]

863. By Marc Tardif on 2010-12-23

Updated parsing of config parameters which fixes bug #689140.

864. By Marc Tardif on 2011-01-12

Merged from trunk.

865. By Marc Tardif on 2011-01-12

Merged from whitelist_file_comments_support.

866. By Marc Tardif on 2011-01-12

Fixed jobs_info plugin to strip commented lines in whitelist and blacklist files which might start with a space.

867. By Marc Tardif on 2011-01-12

Added additional logging to the reactor when firing messages.

868. By Marc Tardif on 2011-01-26

Merged from checkbox-add-pm-utils-requirement branch.

869. By Marc Tardif on 2011-01-27

Added support for TOUCH devices.

870. By Jeff Lane  on 2011-02-02

Merged cr3s fix for bug #561816

871. By Marc Tardif on 2011-02-02

Merged from bladernr to add _attachment suffix and lsmod attachment.

872. By Marc Tardif on 2011-02-02

Updated pot file.

873. By Marc Tardif on 2011-02-02

Fixed memory persistence to be rooted like file persistence.

874. By Marc Tardif on 2011-02-02

Fixed persist module to support not being given a filename.

875. By Marc Tardif on 2011-02-02

Extended persist_info plugin to answer to both begin and prompt-begin messages.

876. By Marc Tardif on 2011-02-03

Added support for Python 2.5 in checkbox.lib.transport.

877. By Marc Tardif on 2011-02-08

Merged from audio_test_failing branch.

878. By Marc Tardif on 2011-02-09

Merged from syslog branch.

879. By Marc Tardif on 2011-02-11

Added stop signal when executing messages.

880. By Marc Tardif on 2011-02-14

Migrated UI from libglade to gtkbuilder which fixes bug #403534.

881. By Marc Tardif on 2011-02-14

Defining default options in checkbox.application rather than CHECKBOX_OPTIONS environment variable.

882. By Marc Tardif on 2011-02-14

Added changelog entry for candidate revision.

883. By Marc Tardif on 2011-02-15

Merged from 719552.

884. By Marc Tardif on 2011-02-16

Changed description of nautilus_file_copy job which fixes bug #709688.

885. By Marc Tardif on 2011-02-18

Fixed title in progress dialog.

886. By Marc Tardif on 2011-02-25

Updated changelog with new upstream release.

887. By Marc Tardif on 2011-03-01

Updated pot file.

888. By Marc Tardif on 2011-03-01

Merged from 727411.

889. By Marc Tardif on 2011-03-11

Merged from 691241.

890. By Marc Tardif on 2011-03-11

Added support for trying to submit twice which fixes bug #531010.

891. By Marc Tardif on 2011-03-11

Merged from 642001.

892. By Jeff Lane  on 2011-03-11

Merged cli-cleanup for bug #221400

893. By Marc Tardif on 2011-03-14

Merged from checkbox-bug-fixes.

894. By Jeff Lane  on 2011-03-17

Land translation work by Mahyuddin Susanto via Michael Terry

895. By Jeff Lane  on 2011-03-17

Merged cr3 changes to changelog and control

896. By Marc Tardif on 2011-03-18

Added changelog entry for candidate revision.

897. By Jeff Lane  on 2011-03-29

Commited Gerhard Burgers punctuation fix for LP #744167

898. By Marc Tardif on 2011-03-29

Merged from 553777.

899. By Marc Tardif on 2011-03-29

Moved Gerhard Burger in changelog from 0.11.2 to 0.11.3.

900. By Marc Tardif on 2011-03-30

Fixed missing capital letter in sleep_state_test description.

901. By Marc Tardif on 2011-03-30

Merged from 744964.

902. By Jeff Lane  on 2011-04-05

Merged Marc Tardif fix for lp:729431

903. By Jeff Lane  on 2011-04-05

Merged Marc Tardif fixes to hibernate test for lp:630785

904. By Jeff Lane  on 2011-04-05

Merged addition of rtc test to sleep.txt.in to meet dependencies

905. By Marc Tardif on 2011-04-05

Reintroduced pm-utils requirements for jobs calling the sleep_test command and update po files.

906. By Marc Tardif on 2011-04-05

Merged checkbox log to apport report.

907. By Marc Tardif on 2011-04-05

Added changelog entry for candidate revision.

908. By Marc Tardif on 2011-04-18

Merged branch to enable camera detect test.

909. By Jeff Lane  on 2011-04-22

Merged Carl Milettes fix for lp:507943 (disk_bench_test hard coded drive)

910. By Marc Tardif on 2011-05-05

Fixed eval of resources with names like list item names.

911. By Marc Tardif on 2011-05-17

Merged from pygi-gtk3-port.

912. By Marc Tardif on 2011-05-17

Removed dead pixel test.

913. By Marc Tardif on 2011-05-19

Merged from 773667.

914. By Marc Tardif on 2011-05-24

Merged from 776734.

915. By Marc Tardif on 2011-05-25

Merged from 786924.

916. By Marc Tardif on 2011-05-25

Merged from 776712.

917. By Jeff Lane  on 2011-05-31

Applied Marc Tardifs changes to allow for remote submission (send results from a system other than the system under test)

918. By Marc Tardif on 2011-06-03

Merged from 588539.

919. By Marc Tardif on 2011-06-06

Merged from 665299.

920. By Marc Tardif on 2011-06-07

Wrapped submission stream to check for illegal xml characters.

921. By Marc Tardif on 2011-06-08

Replaced dependency on pytz with dateutil.

922. By Marc Tardif on 2011-06-10

Merged from 621880.

923. By Marc Tardif on 2011-06-13

Merged from add_camera_tests.

924. By Marc Tardif on 2011-06-13

Merged from fix_get_pointer_error.

925. By Marc Tardif on 2011-06-13

Incremented version.

926. By Marc Tardif on 2011-06-16

Merged from 798200.

927. By Marc Tardif on 2011-06-16

Merged from patch_resourceobject_contains.

928. By Marc Tardif on 2011-06-16

Merged from checkbox-fix-pygi-misbehaviors.

929. By Marc Tardif on 2011-06-16

Merged from 744190.

930. By Marc Tardif on 2011-06-16

Merged from add_interface_option_for_multi_nic_test.

931. By Marc Tardif on 2011-06-21

Merged from test-name-in-report-a-bug.

932. By Marc Tardif on 2011-06-21

Incremented version.

933. By Marc Tardif on 2011-06-28

Only reading CHECKBOX_* environment variables in config which fixes bug #802458.

934. By Marc Tardif on 2011-06-29

Added preliminary default.whitelist.

935. By Marc Tardif on 2011-06-29

Imported scripts and jobs from Platform Services.

936. By Daniel Manrique on 2011-06-29

merge patch_log_format_object

937. By Marc Tardif on 2011-06-29

Imported plugins from Platform Services.

938. By Daniel Manrique on 2011-06-29

merged patch_apport_interface_yesno

939. By Marc Tardif on 2011-06-29

Merged switch to dh_python2 and debhelper7 which fixes bug #788514.

940. By Brendan Donegan on 2011-06-30

Removed some tests that shouldn't have appeared in the whitelist.

941. By Marc Tardif on 2011-07-01

Merged from improve_failed_test_message.

942. By Daniel Manrique on 2011-07-01

merged Barry Warsaw's fix for problem with non-existing executables while building from clean tree

943. By Marc Tardif on 2011-07-06

Merged from camera_test_grouping.

944. By Marc Tardif on 2011-07-07

Merged from story325_test_organisation.

945. By Marc Tardif on 2011-07-07

Updated pot file.

946. By Daniel Manrique on 2011-07-08

merged missing_suites branch

947. By Daniel Manrique on 2011-07-08

Fixed typo in local job definition which caused exception and test to not be run

948. By Daniel Manrique on 2011-07-11

merge story221_move_30_cycles_to_stress

949. By Daniel Manrique on 2011-07-11

merged fixup_powermanagement_suspends

950. By Daniel Manrique on 2011-07-11

merged story221_cpu_before_after_suspend

951. By Daniel Manrique on 2011-07-13

merge patch_exit_on_whitelist_file_not_found

952. By Daniel Manrique on 2011-07-13

merged patch_display_text_in_show_tree_method

953. By Daniel Manrique on 2011-07-13

merged from story221_memory_suspend

954. By Marc Tardif on 2011-07-15

Merged from fix-backend-protocol.

955. By Marc Tardif on 2011-07-15

Merged from 804369-808423.

956. By Daniel Manrique on 2011-07-15

Change mention of OpenOffice to LibreOffice (thanks to David Baucum)

957. By Launchpad Translations on behalf of checkbox-dev on 2011-07-16

Launchpad automatic translations update.

[Daniel Manrique (roadmr)]

Looks good, I merged and tested this both on Natty and Oneiric and it works as intended.

Thanks!

review: Approve

[Javier Collado (javier.collado)]

Thanks for merging. I'll set the bug status to fix committed.

=== modified file 'checkbox_gtk/gtk_interface.py'
--- checkbox_gtk/gtk_interface.py	2011-05-17 13:47:10 +0000
+++ checkbox_gtk/gtk_interface.py	2011-06-08 14:34:01 +0000
@@ -377,15 +377,22 @@
                 active = not treestore.get_value(iter, COLUMN_ACTIVE)
             treestore.set_value(iter, COLUMN_ACTIVE, active)
 
-            # Set parents
-            def set_parents(iter):
-                parent = treestore.iter_parent(iter)
-                if parent:
-                    treestore.set_value(parent, COLUMN_ACTIVE, active)
-                    set_parents(parent)
+            # Set ancestors
+            def set_ancestors(iterator):
+                parent_row = treestore[iterator].parent
+                if active:
+                    while parent_row:
+                        parent_row[COLUMN_ACTIVE] = active
+                        parent_row = parent_row.parent
+                else:
+                    while parent_row:
+                        if any(child[COLUMN_ACTIVE]
+                               for child in parent_row.iterchildren()):
+                            break
+                        parent_row[COLUMN_ACTIVE] = active
+                        parent_row = parent_row.parent
 
-            if active:
-                set_parents(iter)
+            set_ancestors(iter)
 
             # Set children
             def set_children(iter):