1
=== modified file 'autopilot/introspection/dbus.py'
2
--- autopilot/introspection/dbus.py	2013-11-07 21:27:55 +0000
3
+++ autopilot/introspection/dbus.py	2014-02-25 22:20:40 +0000
4
@@ -77,16 +77,16 @@
5
77
77
6
78
        if class_name is None:
78
        if class_name is None:
7
79
            self._message = \
79
            self._message = \
9
80
                u"State not found with filters {}.".format(
80
                u"Object not found with properties {}.".format(
10
81
                    repr(filters)
81
                    repr(filters)
11
82
                )
82
                )
12
83
        elif not filters:
83
        elif not filters:
14
84
            self._message = u"State not found for class '{}'.".format(
84
            self._message = u"Object not found with name '{}'.".format(
15
85
                class_name
85
                class_name
16
86
            )
86
            )
17
87
        else:
87
        else:
18
88
            self._message = \
88
            self._message = \
20
89
                u"State not found for class '{}' and filters {}.".format(
89
                u"Object not found with name '{}' and properties {}.".format(
21
90
                    class_name,
90
                    class_name,
22
91
                    repr(filters)
91
                    repr(filters)
23
92
                )
92
                )
24
93
93
25
=== modified file 'autopilot/tests/unit/test_exceptions.py'
26
--- autopilot/tests/unit/test_exceptions.py	2013-10-13 21:49:49 +0000
27
+++ autopilot/tests/unit/test_exceptions.py	2014-02-25 22:20:40 +0000
28
@@ -41,12 +41,12 @@
29
41
        err = StateNotFoundError("MyClass")
41
        err = StateNotFoundError("MyClass")
30
42
        self.assertThat(
42
        self.assertThat(
31
43
            str(err),
43
            str(err),
33
44
            Equals("State not found for class 'MyClass'.")
44
            Equals("Object not found with name 'MyClass'.")
34
45
        )
45
        )
35
46
        if not six.PY3:
46
        if not six.PY3:
36
47
            self.assertThat(
47
            self.assertThat(
37
48
                unicode(err),
48
                unicode(err),
39
49
                Equals(u"State not found for class 'MyClass'.")
49
                Equals(u"Object not found with name 'MyClass'.")
40
50
            )
50
            )
41
51
51
42
52
    def test_can_be_constructed_with_filters_only(self):
52
    def test_can_be_constructed_with_filters_only(self):
43
@@ -54,12 +54,12 @@
44
54
        err = StateNotFoundError(foo="bar")
54
        err = StateNotFoundError(foo="bar")
45
55
        self.assertThat(
55
        self.assertThat(
46
56
            str(err),
56
            str(err),
48
57
            Equals("State not found with filters {'foo': 'bar'}.")
57
            Equals("Object not found with properties {'foo': 'bar'}.")
49
58
        )
58
        )
50
59
        if not six.PY3:
59
        if not six.PY3:
51
60
            self.assertThat(
60
            self.assertThat(
52
61
                unicode(err),
61
                unicode(err),
54
62
                Equals(u"State not found with filters {'foo': 'bar'}.")
62
                Equals(u"Object not found with properties {'foo': 'bar'}.")
55
63
            )
63
            )
56
64
64
57
65
    def test_can_be_constructed_with_class_name_and_filters(self):
65
    def test_can_be_constructed_with_class_name_and_filters(self):
58
@@ -67,12 +67,12 @@
59
67
        err = StateNotFoundError('MyClass', foo="bar")
67
        err = StateNotFoundError('MyClass', foo="bar")
60
68
        self.assertThat(
68
        self.assertThat(
61
69
            str(err),
69
            str(err),
64
70
            Equals("State not found for class 'MyClass'"
70
            Equals("Object not found with name 'MyClass'"
65
71
                   " and filters {'foo': 'bar'}.")
71
                   " and properties {'foo': 'bar'}.")
66
72
        )
72
        )
67
73
        if not six.PY3:
73
        if not six.PY3:
68
74
            self.assertThat(
74
            self.assertThat(
69
75
                unicode(err),
75
                unicode(err),
72
76
                Equals(u"State not found for class 'MyClass'"
76
                Equals(u"Object not found with name 'MyClass'"
73
77
                       " and filters {'foo': 'bar'}.")
77
                       " and properties {'foo': 'bar'}.")
74
78
            )
78
            )
Reviewer	Review Type	Date Requested	Status
Thomi Richards (community)		2014-02-20	Approve on 2014-02-26
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-02-25
Review via email: mp+207543@code.launchpad.net
1	=== modified file 'autopilot/introspection/dbus.py'
2	--- autopilot/introspection/dbus.py 2013-11-07 21:27:55 +0000
3	+++ autopilot/introspection/dbus.py 2014-02-25 22:20:40 +0000
4	@@ -77,16 +77,16 @@
5	77		77
6	78	if class_name is None:	78	if class_name is None:
7	79	self._message = \	79	self._message = \
9	80	u"State not found with filters {}.".format(	80	u"Object not found with properties {}.".format(
10	81	repr(filters)	81	repr(filters)
11	82	)	82	)
12	83	elif not filters:	83	elif not filters:
14	84	self._message = u"State not found for class '{}'.".format(	84	self._message = u"Object not found with name '{}'.".format(
15	85	class_name	85	class_name
16	86	)	86	)
17	87	else:	87	else:
18	88	self._message = \	88	self._message = \
20	89	u"State not found for class '{}' and filters {}.".format(	89	u"Object not found with name '{}' and properties {}.".format(
21	90	class_name,	90	class_name,
22	91	repr(filters)	91	repr(filters)
23	92	)	92	)
24	93		93
25	=== modified file 'autopilot/tests/unit/test_exceptions.py'
26	--- autopilot/tests/unit/test_exceptions.py 2013-10-13 21:49:49 +0000
27	+++ autopilot/tests/unit/test_exceptions.py 2014-02-25 22:20:40 +0000
28	@@ -41,12 +41,12 @@
29	41	err = StateNotFoundError("MyClass")	41	err = StateNotFoundError("MyClass")
30	42	self.assertThat(	42	self.assertThat(
31	43	str(err),	43	str(err),
33	44	Equals("State not found for class 'MyClass'.")	44	Equals("Object not found with name 'MyClass'.")
34	45	)	45	)
35	46	if not six.PY3:	46	if not six.PY3:
36	47	self.assertThat(	47	self.assertThat(
37	48	unicode(err),	48	unicode(err),
39	49	Equals(u"State not found for class 'MyClass'.")	49	Equals(u"Object not found with name 'MyClass'.")
40	50	)	50	)
41	51		51
42	52	def test_can_be_constructed_with_filters_only(self):	52	def test_can_be_constructed_with_filters_only(self):
43	@@ -54,12 +54,12 @@
44	54	err = StateNotFoundError(foo="bar")	54	err = StateNotFoundError(foo="bar")
45	55	self.assertThat(	55	self.assertThat(
46	56	str(err),	56	str(err),
48	57	Equals("State not found with filters {'foo': 'bar'}.")	57	Equals("Object not found with properties {'foo': 'bar'}.")
49	58	)	58	)
50	59	if not six.PY3:	59	if not six.PY3:
51	60	self.assertThat(	60	self.assertThat(
52	61	unicode(err),	61	unicode(err),
54	62	Equals(u"State not found with filters {'foo': 'bar'}.")	62	Equals(u"Object not found with properties {'foo': 'bar'}.")
55	63	)	63	)
56	64		64
57	65	def test_can_be_constructed_with_class_name_and_filters(self):	65	def test_can_be_constructed_with_class_name_and_filters(self):
58	@@ -67,12 +67,12 @@
59	67	err = StateNotFoundError('MyClass', foo="bar")	67	err = StateNotFoundError('MyClass', foo="bar")
60	68	self.assertThat(	68	self.assertThat(
61	69	str(err),	69	str(err),
64	70	Equals("State not found for class 'MyClass'"	70	Equals("Object not found with name 'MyClass'"
65	71	" and filters {'foo': 'bar'}.")	71	" and properties {'foo': 'bar'}.")
66	72	)	72	)
67	73	if not six.PY3:	73	if not six.PY3:
68	74	self.assertThat(	74	self.assertThat(
69	75	unicode(err),	75	unicode(err),
72	76	Equals(u"State not found for class 'MyClass'"	76	Equals(u"Object not found with name 'MyClass'"
73	77	" and filters {'foo': 'bar'}.")	77	" and properties {'foo': 'bar'}.")
74	78	)	78	)