1
=== modified file 'autopilot/introspection/dbus.py'
2
--- autopilot/introspection/dbus.py	2014-03-20 21:26:27 +0000
3
+++ autopilot/introspection/dbus.py	2014-03-20 21:26:27 +0000
4
@@ -262,6 +262,7 @@
5
262
        # Thomi: 2014-03-20: There used to be a call to 'self.refresh_state()'
262
        # Thomi: 2014-03-20: There used to be a call to 'self.refresh_state()'
6
263
        # here. That's not needed, since the only thing we use is the proxy
263
        # here. That's not needed, since the only thing we use is the proxy
7
264
        # path, which isn't affected by the current state.
264
        # path, which isn't affected by the current state.
8
265
9
265
        query = self.get_class_query_string() + "/*"
266
        query = self.get_class_query_string() + "/*"
10
266
        state_dicts = self.get_state_by_path(query)
267
        state_dicts = self.get_state_by_path(query)
11
267
        children = [self.make_introspection_object(i) for i in state_dicts]
268
        children = [self.make_introspection_object(i) for i in state_dicts]
12
@@ -661,12 +662,15 @@
13
661
        else:
662
        else:
14
662
            properties = self.get_properties()
663
            properties = self.get_properties()
15
663
        # print properties
664
        # print properties
22
664
        for key in sorted(properties.keys()):
665
        try:
23
665
            output.write("%s%s: %r\n" % (indent, key, properties[key]))
666
            for key in sorted(properties.keys()):
24
666
        # print children
667
                output.write("%s%s: %r\n" % (indent, key, properties[key]))
25
667
        if maxdepth is None or _curdepth < maxdepth:
668
                # print children
26
668
            for c in self.get_children():
669
                if maxdepth is None or _curdepth < maxdepth:
27
669
                c.print_tree(output, maxdepth, _curdepth + 1)
670
                    for c in self.get_children():
28
671
                        c.print_tree(output, maxdepth, _curdepth + 1)
29
672
        except StateNotFoundError as error:
30
673
            output.write("%sError: %s\n" % (indent, error))
31
670
674
32
671
    @contextmanager
675
    @contextmanager
33
672
    def no_automatic_refreshing(self):
676
    def no_automatic_refreshing(self):
34
673
677
35
=== modified file 'autopilot/tests/unit/test_introspection_features.py'
36
--- autopilot/tests/unit/test_introspection_features.py	2014-03-11 17:36:53 +0000
37
+++ autopilot/tests/unit/test_introspection_features.py	2014-03-20 21:26:27 +0000
38
@@ -55,6 +55,7 @@
39
55
    _object_passes_filters,
55
    _object_passes_filters,
40
56
    CustomEmulatorBase,
56
    CustomEmulatorBase,
41
57
    DBusIntrospectionObject,
57
    DBusIntrospectionObject,
42
58
    StateNotFoundError,
43
58
)
59
)
44
59
from autopilot.utilities import sleep
60
from autopilot.utilities import sleep
45
60
61
46
@@ -305,6 +306,23 @@
47
305
            text: 'Hello'
306
            text: 'Hello'
48
306
            """))
307
            """))
49
307
308
50
309
    def test_print_tree_exception(self):
51
310
        """print_tree with StateNotFound exception"""
52
311
53
312
        fake_object = self._print_test_fake_object()
54
313
        child = Mock()
55
314
        child.print_tree.side_effect = StateNotFoundError('child')
56
315
57
316
        with patch.object(fake_object, 'get_children', return_value=[child]):
58
317
            out = StringIO()
59
318
            print_func = lambda: fake_object.print_tree(out)
60
319
            self.assertThat(print_func, Not(Raises(StateNotFoundError)))
61
320
            self.assertEqual(out.getvalue(), dedent("""\
62
321
            == /some/path ==
63
322
            id: 123
64
323
            Error: Object not found with name 'child'.
65
324
            """))
66
325
67
308
    def test_print_tree_fileobj(self):
326
    def test_print_tree_fileobj(self):
68
309
        """print_tree with file object output"""
327
        """print_tree with file object output"""
69
310
328
Reviewer	Review Type	Date Requested	Status
Nicholas Skaggs (community)			Approve on 2014-03-21
PS Jenkins bot	continuous-integration	2014-03-20	Needs Fixing on 2014-03-20
Chris Gagnon		2014-03-20	Pending
Thomi Richards		2014-03-20	Pending
Max Brustkern		2014-03-20	Pending
Review via email: mp+212053@code.launchpad.net