1
=== modified file 'autopilot/introspection/_search.py'
2
--- autopilot/introspection/_search.py	2016-01-22 17:21:36 +0000
3
+++ autopilot/introspection/_search.py	2016-04-12 03:02:16 +0000
4
@@ -171,6 +171,16 @@
5
171
        process
171
        process
6
172
    )
172
    )
7
173
173
8
174
    if pid is not None:
9
175
        # Due to the filtering including children parents, if there exists a
10
176
        # top-level pid, take that instead of any children that may have
11
177
        # matched.
12
178
        connections = _filter_parent_pids_from_children(
13
179
            pid,
14
180
            connections,
15
181
            dbus_bus
16
182
        )
17
183
18
174
    _raise_if_not_single_result(
184
    _raise_if_not_single_result(
19
175
        connections,
185
        connections,
20
176
        _get_search_criteria_string_representation(**kwargs)
186
        _get_search_criteria_string_representation(**kwargs)
21
@@ -184,6 +194,38 @@
22
184
    )
194
    )
23
185
195
24
186
196
25
197
def _map_connection_to_pid(connection, dbus_bus):
26
198
    try:
27
199
        return _get_bus_connections_pid(dbus_bus, connection)
28
200
    except dbus.DBusException as e:
29
201
        logger.info(
30
202
            "dbus.DBusException while attempting to get PID for %s: %r" %
31
203
            (connection, e))
32
204
33
205
34
206
def _filter_parent_pids_from_children(
35
207
        pid, connections, dbus_bus, _connection_pid_fn=_map_connection_to_pid):
36
208
    """Return any connections that have an actual pid matching the requested
37
209
    and aren't just a child of that requested pid.
38
210
39
211
    :param pid: Pid passed in for matching
40
212
    :param connections: List of connections to filter
41
213
    :param dbus_bus: Dbus object that the connections are contained.
42
214
    :param _connection_pid_fn: Function that takes 2 args 'connection' 'dbus
43
215
      object' that returns the pid (or None if not found) of the connection on
44
216
      that dbus bus.
45
217
      (Note: Useful for testing.)
46
218
    :returns: List of suitable connections (e.g. returns what was passed if no
47
219
      connections match the pid (i.e. all matches are children)).
48
220
49
221
    """
50
222
    for conn in connections:
51
223
        if pid == _connection_pid_fn(conn, dbus_bus):
52
224
            logger.info('Found the parent pid, ignoring any others.')
53
225
            return [conn]
54
226
    return connections
55
227
56
228
57
187
def _get_dbus_bus_from_string(dbus_string):
229
def _get_dbus_bus_from_string(dbus_string):
58
188
    if dbus_string == 'session':
230
    if dbus_string == 'session':
59
189
        return dbus_handler.get_session_bus()
231
        return dbus_handler.get_session_bus()
60
190
232
61
=== modified file 'autopilot/tests/unit/test_introspection_search.py'
62
--- autopilot/tests/unit/test_introspection_search.py	2015-06-16 02:39:23 +0000
63
+++ autopilot/tests/unit/test_introspection_search.py	2016-04-12 03:02:16 +0000
64
@@ -19,7 +19,7 @@
65
19
19
66
20
from dbus import DBusException
20
from dbus import DBusException
67
21
import os
21
import os
69
22
from unittest.mock import patch, Mock
22
from unittest.mock import call, patch, Mock
70
23
from testtools import TestCase
23
from testtools import TestCase
71
24
from testtools.matchers import (
24
from testtools.matchers import (
72
25
    Contains,
25
    Contains,
73
@@ -581,6 +581,82 @@
74
581
        self.assertEqual(fake_process.pid, observed)
581
        self.assertEqual(fake_process.pid, observed)
75
582
582
76
583
583
77
584
class FilterParentPidsFromChildrenTests(TestCase):
78
585
79
586
    def test_returns_all_connections_with_no_parent_match(self):
80
587
        search_pid = 123
81
588
        connections = ['1:0', '1:3']
82
589
        dbus_bus = Mock()
83
590
        pid_mapping = Mock(side_effect=[111, 222])
84
591
        self.assertThat(
85
592
            _s._filter_parent_pids_from_children(
86
593
                search_pid,
87
594
                connections,
88
595
                dbus_bus,
89
596
                _connection_pid_fn=pid_mapping
90
597
            ),
91
598
            Equals(connections)
92
599
        )
93
600
94
601
    def test_calls_connection_pid_fn_in_order(self):
95
602
        search_pid = 123
96
603
        connections = ['1:3', '1:0']
97
604
        dbus_bus = Mock()
98
605
        pid_mapping = Mock(side_effect=[222, 123])
99
606
        _s._filter_parent_pids_from_children(
100
607
            search_pid,
101
608
            connections,
102
609
            dbus_bus,
103
610
            _connection_pid_fn=pid_mapping
104
611
        )
105
612
106
613
        self.assertTrue(
107
614
            pid_mapping.call_args_list == [
108
615
                call('1:3', dbus_bus),
109
616
                call('1:0', dbus_bus)
110
617
            ]
111
618
        )
112
619
113
620
    def test_returns_just_parent_connection_with_pid_match(self):
114
621
        search_pid = 123
115
622
        # connection '1.0' has pid 123.
116
623
        connections = ['1:3', '1:0']
117
624
        dbus_bus = Mock()
118
625
        # Mapping returns parent pid on second call.
119
626
        pid_mapping = Mock(side_effect=[222, 123])
120
627
        self.assertThat(
121
628
            _s._filter_parent_pids_from_children(
122
629
                search_pid,
123
630
                connections,
124
631
                dbus_bus,
125
632
                _connection_pid_fn=pid_mapping
126
633
            ),
127
634
            Equals(['1:0'])
128
635
        )
129
636
130
637
        self.assertTrue(
131
638
            pid_mapping.call_args_list == [
132
639
                call('1:3', dbus_bus),
133
640
                call('1:0', dbus_bus)
134
641
            ]
135
642
        )
136
643
137
644
    def test_returns_all_connections_with_no_pids_returned_in_search(self):
138
645
        search_pid = 123
139
646
        connections = ['1:3', '1:0']
140
647
        dbus_bus = Mock()
141
648
        pid_mapping = Mock(side_effect=[None, None])
142
649
        self.assertThat(
143
650
            _s._filter_parent_pids_from_children(
144
651
                search_pid,
145
652
                connections,
146
653
                dbus_bus,
147
654
                _connection_pid_fn=pid_mapping
148
655
            ),
149
656
            Equals(connections)
150
657
        )
151
658
152
659
153
584
class ProcessSearchErrorStringRepTests(TestCase):
660
class ProcessSearchErrorStringRepTests(TestCase):
154
585
661
155
586
    """Various tests for the _get_search_criteria_string_representation
662
    """Various tests for the _get_search_criteria_string_representation
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2016-04-12
Thomi Richards (community)			Approve on 2016-04-12
platform-qa-bot	continuous-integration		Approve on 2016-04-12
Autopilot Hackers		2016-04-11	Pending
Review via email: mp+291568@code.launchpad.net