Merge lp:~timo-jyrinki/autopilot/ap1.5_dbus_search_no_seen_connections into lp:autopilot/1.5

Proposed by Timo Jyrinki
Status: Rejected
Rejected by: Christopher Lee
Proposed branch: lp:~timo-jyrinki/autopilot/ap1.5_dbus_search_no_seen_connections
Merge into: lp:autopilot/1.5
Diff against target: 22 lines (+1/-5)
1 file modified
autopilot/introspection/_search.py (+1/-5)
To merge this branch: bzr merge lp:~timo-jyrinki/autopilot/ap1.5_dbus_search_no_seen_connections
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Albert Astals Cid (community) Abstain
Thomi Richards Pending
Leo Arias Pending
Christopher Lee Pending
Review via email: mp+254200@code.launchpad.net

Commit message

Do not store seen_connections

Paths can appear later than the bus has been created, so storing them to ignore them in the next loop can
make it ignore a bus that did not have the match but now does

Description of the change

To post a comment you must log in.
Revision history for this message
Albert Astals Cid (aacid) :
review: Abstain
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:509
http://jenkins.qa.ubuntu.com/job/autopilot-1.5-ci/20/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-vivid-amd64-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-vivid-amd64-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-vivid-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-vivid-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-vivid-i386-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-vivid-i386-ci/6/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1981
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid-autopilot/142
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1746
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1979
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1979/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19180
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid-autopilot/144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/896
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/896/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-1.5-ci/20/rebuild

review: Approve (continuous-integration)
Revision history for this message
Christopher Lee (veebers) wrote :

Rejected as this MP isn't needed. Due to the slightly obscure way that autopilot trunk is released (i.e. merged into this one) the code is merged into lp:autopilot then at landing time merged into lp:autopilot/1.5

Unmerged revisions

509. By Albert Astals Cid

Do not store seen_connections

Paths can appear later than the bus has been created, so storing them to ignore them in the next loop can
make it ignore a bus that did not have the match but now does

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'autopilot/introspection/_search.py'
2--- autopilot/introspection/_search.py 2014-07-31 20:02:49 +0000
3+++ autopilot/introspection/_search.py 2015-03-26 06:35:45 +0000
4@@ -307,17 +307,13 @@
5 while we're searching for it.
6
7 """
8- seen_connections = []
9-
10 for _ in Timeout.default():
11 _get_child_pids.reset_cache()
12 _raise_if_process_has_exited(process)
13
14 connections = _get_buses_unchecked_connection_names(
15- bus,
16- seen_connections
17+ bus
18 )
19- seen_connections.extend(connections)
20
21 valid_connections = [
22 c for c

Subscribers

People subscribed via source and target branches