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

Proposed by Javier Collado
Status: Merged
Merged at revision: 961
Proposed branch: lp:~oem-qa/checkbox/patch_deselect_ancestors_when_no_child_is_selected
Merge into: lp:checkbox
Diff against target: 34 lines (+15/-8)
1 file modified
checkbox_gtk/gtk_interface.py (+15/-8)
To merge this branch: bzr merge lp:~oem-qa/checkbox/patch_deselect_ancestors_when_no_child_is_selected
Reviewer Review Type Date Requested Status
Daniel Manrique Approve
Marc Tardif Pending
Review via email: mp+37112@code.launchpad.net

Description of the change

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).

To post a comment you must log in.
859. By Marc Tardif

Merged from cli_no_answer branch.

860. By Marc Tardif

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

861. By Marc Tardif

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

862. By Marc Tardif

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

Revision history for this message
Javier Collado (javier.collado) wrote :

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.

863. By Marc Tardif

Updated parsing of config parameters which fixes bug #689140.

864. By Marc Tardif

Merged from trunk.

865. By Marc Tardif

Merged from whitelist_file_comments_support.

866. By Marc Tardif

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

867. By Marc Tardif

Added additional logging to the reactor when firing messages.

868. By Marc Tardif

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

869. By Marc Tardif

Added support for TOUCH devices.

870. By Jeff Lane

Merged cr3s fix for bug #561816

871. By Marc Tardif

Merged from bladernr to add _attachment suffix and lsmod attachment.

872. By Marc Tardif

Updated pot file.

873. By Marc Tardif

Fixed memory persistence to be rooted like file persistence.

874. By Marc Tardif

Fixed persist module to support not being given a filename.

875. By Marc Tardif

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

876. By Marc Tardif

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

877. By Marc Tardif

Merged from audio_test_failing branch.

878. By Marc Tardif

Merged from syslog branch.

879. By Marc Tardif

Added stop signal when executing messages.

880. By Marc Tardif

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

881. By Marc Tardif

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

882. By Marc Tardif

Added changelog entry for candidate revision.

883. By Marc Tardif

Merged from 719552.

884. By Marc Tardif

Changed description of nautilus_file_copy job which fixes bug #709688.

885. By Marc Tardif

Fixed title in progress dialog.

886. By Marc Tardif

Updated changelog with new upstream release.

887. By Marc Tardif

Updated pot file.

888. By Marc Tardif

Merged from 727411.

889. By Marc Tardif

Merged from 691241.

890. By Marc Tardif

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

891. By Marc Tardif

Merged from 642001.

892. By Jeff Lane

Merged cli-cleanup for bug #221400

893. By Marc Tardif

Merged from checkbox-bug-fixes.

894. By Jeff Lane

Land translation work by Mahyuddin Susanto via Michael Terry

895. By Jeff Lane

Merged cr3 changes to changelog and control

896. By Marc Tardif

Added changelog entry for candidate revision.

897. By Jeff Lane

Commited Gerhard Burgers punctuation fix for LP #744167

898. By Marc Tardif

Merged from 553777.

899. By Marc Tardif

Moved Gerhard Burger in changelog from 0.11.2 to 0.11.3.

900. By Marc Tardif

Fixed missing capital letter in sleep_state_test description.

901. By Marc Tardif

Merged from 744964.

902. By Jeff Lane

Merged Marc Tardif fix for lp:729431

903. By Jeff Lane

Merged Marc Tardif fixes to hibernate test for lp:630785

904. By Jeff Lane

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

905. By Marc Tardif

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

906. By Marc Tardif

Merged checkbox log to apport report.

907. By Marc Tardif

Added changelog entry for candidate revision.

908. By Marc Tardif

Merged branch to enable camera detect test.

909. By Jeff Lane

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

910. By Marc Tardif

Fixed eval of resources with names like list item names.

911. By Marc Tardif

Merged from pygi-gtk3-port.

912. By Marc Tardif

Removed dead pixel test.

913. By Marc Tardif

Merged from 773667.

914. By Marc Tardif

Merged from 776734.

915. By Marc Tardif

Merged from 786924.

916. By Marc Tardif

Merged from 776712.

917. By Jeff Lane

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

918. By Marc Tardif

Merged from 588539.

919. By Marc Tardif

Merged from 665299.

920. By Marc Tardif

Wrapped submission stream to check for illegal xml characters.

921. By Marc Tardif

Replaced dependency on pytz with dateutil.

922. By Marc Tardif

Merged from 621880.

923. By Marc Tardif

Merged from add_camera_tests.

924. By Marc Tardif

Merged from fix_get_pointer_error.

925. By Marc Tardif

Incremented version.

926. By Marc Tardif

Merged from 798200.

927. By Marc Tardif

Merged from patch_resourceobject_contains.

928. By Marc Tardif

Merged from checkbox-fix-pygi-misbehaviors.

929. By Marc Tardif

Merged from 744190.

930. By Marc Tardif

Merged from add_interface_option_for_multi_nic_test.

931. By Marc Tardif

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

932. By Marc Tardif

Incremented version.

933. By Marc Tardif

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

934. By Marc Tardif

Added preliminary default.whitelist.

935. By Marc Tardif

Imported scripts and jobs from Platform Services.

936. By Daniel Manrique

merge patch_log_format_object

937. By Marc Tardif

Imported plugins from Platform Services.

938. By Daniel Manrique

merged patch_apport_interface_yesno

939. By Marc Tardif

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

940. By Brendan Donegan

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

941. By Marc Tardif

Merged from improve_failed_test_message.

942. By Daniel Manrique

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

943. By Marc Tardif

Merged from camera_test_grouping.

944. By Marc Tardif

Merged from story325_test_organisation.

945. By Marc Tardif

Updated pot file.

946. By Daniel Manrique

merged missing_suites branch

947. By Daniel Manrique

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

948. By Daniel Manrique

merge story221_move_30_cycles_to_stress

949. By Daniel Manrique

merged fixup_powermanagement_suspends

950. By Daniel Manrique

merged story221_cpu_before_after_suspend

951. By Daniel Manrique

merge patch_exit_on_whitelist_file_not_found

952. By Daniel Manrique

merged patch_display_text_in_show_tree_method

953. By Daniel Manrique

merged from story221_memory_suspend

954. By Marc Tardif

Merged from fix-backend-protocol.

955. By Marc Tardif

Merged from 804369-808423.

956. By Daniel Manrique

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

957. By Launchpad Translations on behalf of checkbox-dev

Launchpad automatic translations update.

Revision history for this message
Daniel Manrique (roadmr) wrote :

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

Thanks!

review: Approve
Revision history for this message
Javier Collado (javier.collado) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'checkbox_gtk/gtk_interface.py'
2--- checkbox_gtk/gtk_interface.py 2011-05-17 13:47:10 +0000
3+++ checkbox_gtk/gtk_interface.py 2011-06-08 14:34:01 +0000
4@@ -377,15 +377,22 @@
5 active = not treestore.get_value(iter, COLUMN_ACTIVE)
6 treestore.set_value(iter, COLUMN_ACTIVE, active)
7
8- # Set parents
9- def set_parents(iter):
10- parent = treestore.iter_parent(iter)
11- if parent:
12- treestore.set_value(parent, COLUMN_ACTIVE, active)
13- set_parents(parent)
14+ # Set ancestors
15+ def set_ancestors(iterator):
16+ parent_row = treestore[iterator].parent
17+ if active:
18+ while parent_row:
19+ parent_row[COLUMN_ACTIVE] = active
20+ parent_row = parent_row.parent
21+ else:
22+ while parent_row:
23+ if any(child[COLUMN_ACTIVE]
24+ for child in parent_row.iterchildren()):
25+ break
26+ parent_row[COLUMN_ACTIVE] = active
27+ parent_row = parent_row.parent
28
29- if active:
30- set_parents(iter)
31+ set_ancestors(iter)
32
33 # Set children
34 def set_children(iter):

Subscribers

People subscribed via source and target branches