1
=== removed directory 'apparmor'
2
=== removed file 'apparmor/click.rules'
3
--- apparmor/click.rules	2014-05-23 09:35:07 +0000
4
+++ apparmor/click.rules	1970-01-01 00:00:00 +0000
5
@@ -1,12 +0,0 @@
6
1
dbus (receive, send)
7
2
     bus=session
8
3
     path=/com/canonical/Autopilot/**,
9
4
# Allow writes to various (application-specific) XDG directories
10
5
  owner @{HOME}/autopilot/fakeenv/*/.cache/@{APP_PKGNAME}/ rw, # subdir of XDG_CACHE_HOME
11
6
  owner @{HOME}/autopilot/fakeenv/*/.cache/@{APP_PKGNAME}/** mrwkl,
12
7
  owner @{HOME}/autopilot/fakeenv/*/.config/@{APP_PKGNAME}/ rw, # subdir of XDG_CONFIG_HOME
13
8
  owner @{HOME}/autopilot/fakeenv/*/.config/@{APP_PKGNAME}/** mrwkl,
14
9
  owner @{HOME}/autopilot/fakeenv/*/.local/share/@{APP_PKGNAME}/ rw, # subdir of XDG_DATA_HOME
15
10
  owner @{HOMEDIRS}/*/autopilot/fakeenv/*/.local/share/@{APP_PKGNAME}/** mrwklix,
16
11
  owner @{HOME}/autopilot/fakeenv/*/confined/@{APP_PKGNAME}/ rw, # subdir of XDG_RUNTIME_DIR
17
12
  owner @{HOME}/autopilot/fakeenv/*/confined/@{APP_PKGNAME}/** mrwkl,
18
13
0
19
=== modified file 'autopilot/introspection/_object_registry.py'
20
--- autopilot/introspection/_object_registry.py	2015-02-25 21:51:40 +0000
21
+++ autopilot/introspection/_object_registry.py	2015-05-06 10:03:54 +0000
22
@@ -1,7 +1,7 @@
23
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
24
2
#
2
#
25
3
# Autopilot Functional Test Tool
3
# Autopilot Functional Test Tool
27
4
# Copyright (C) 2014 Canonical
4
# Copyright (C) 2014, 2015 Canonical
28
5
#
5
#
29
6
# This program is free software: you can redistribute it and/or modify
6
# This program is free software: you can redistribute it and/or modify
30
7
# it under the terms of the GNU General Public License as published by
7
# it under the terms of the GNU General Public License as published by
31
@@ -134,7 +134,6 @@
32
134
    :param object_id: The _id attribute of the class doing the lookup. This is
134
    :param object_id: The _id attribute of the class doing the lookup. This is
33
135
        used to index into the object registry to retrieve the dict of proxy
135
        used to index into the object registry to retrieve the dict of proxy
34
136
        classes to try.
136
        classes to try.
35
137
    :param default_class: default class to use if nothing in dict matches
36
138
    :param path: dbus path
137
    :param path: dbus path
37
139
    :param state: dbus state
138
    :param state: dbus state
38
140
    :returns: appropriate custom proxy class
139
    :returns: appropriate custom proxy class
39
@@ -153,7 +152,8 @@
40
153
    """Identify which custom proxy class matches the dbus path and state.
152
    """Identify which custom proxy class matches the dbus path and state.
41
154
153
42
155
    If more than one class in proxy_class_dict matches, raise an exception.
154
    If more than one class in proxy_class_dict matches, raise an exception.
44
156
    :param proxy_class_dict: dict of proxy classes to try
155
45
156
    :param object_id: id to use to get the dict of proxy classes to  try
46
157
    :param path: dbus path
157
    :param path: dbus path
47
158
    :param state: dbus state dict
158
    :param state: dbus state dict
48
159
    :returns: matching custom proxy class
159
    :returns: matching custom proxy class
49
@@ -173,18 +173,80 @@
50
173
            )
173
            )
51
174
        )
174
        )
52
175
    if len(possible_classes) == 1:
175
    if len(possible_classes) == 1:
53
176
        extended_proxy_bases = _get_proxy_bases_for_id(object_id)
54
177
        mixed = _combine_base_and_extensions(
55
178
            possible_classes[0],
56
179
            extended_proxy_bases
57
180
        )
58
181
        possible_classes[0].__bases__ = mixed
59
176
        return possible_classes[0]
182
        return possible_classes[0]
60
177
    return None
183
    return None
61
178
184
62
179
185
63
186
def _combine_base_and_extensions(kls, extensions):
64
187
    """Returns the bases of the given class augmented with extensions
65
188
66
189
    In order to get the right bases tuple, the given class is removed
67
190
    from the result (to prevent cyclic dependencies), there's only one
68
191
    occurrence of each final base class in the result and the result
69
192
    is ordered following the inheritance order (classes lower in the
70
193
    inheritance tree are listed before in the resulting tuple)
71
194
72
195
    :param kls: class for which we are combining bases and extensions
73
196
    :param extensions: tuple of extensions to be added to kls' bases
74
197
    :returns: bases tuple for kls, including its former bases and the
75
198
             extensions
76
199
77
200
    """
78
201
    # set of bases + extensions removing the original class to prevent
79
202
    # TypeError: a __bases__ item causes an inheritance cycle
80
203
    unique_bases = {x for x in kls.__bases__ + extensions if x != kls}
81
204
82
205
    # sort them taking into account inheritance to prevent
83
206
    # TypeError: Cannot create a consistent method resolution order (MRO)
84
207
    return tuple(
85
208
        sorted(
86
209
            unique_bases,
87
210
            key=lambda cls: _get_mro_sort_order(cls, extensions),
88
211
            reverse=True
89
212
        )
90
213
    )
91
214
92
215
93
216
def _get_mro_sort_order(cls, promoted_collection=()):
94
217
    """Returns the comparable numerical order for the given class honouring
95
218
    its MRO
96
219
97
220
    It accepts an optional parameter for promoting classes in a certain
98
221
    group, this can give more control over the sorting when two classes
99
222
    have the a MRO of the same length
100
223
101
224
    :param cls: the subject class
102
225
    :param promoted_collection: tuple of classes which must be promoted
103
226
    :returns: comparable numerical order, higher for classes with MROs of
104
227
        greater length
105
228
106
229
    """
107
230
    # Multiplying by 2 the lenght of the MRO list gives the chance to promote
108
231
    # items in the promoted_collection by adding them 1 later: non promoted
109
232
    # classes will have even scores and promoted classes with MRO of the same
110
233
    # length will have odd scores one point higher
111
234
    order = 2 * len(cls.mro())
112
235
113
236
    if cls in promoted_collection:
114
237
        order += 1
115
238
116
239
    return order
117
240
118
241
119
180
def _get_default_proxy_class(id, name):
242
def _get_default_proxy_class(id, name):
120
181
    """Return a custom proxy object class of the default or a base class.
243
    """Return a custom proxy object class of the default or a base class.
121
182
244
122
183
    We want the object to inherit from the class that is set as the emulator
245
    We want the object to inherit from the class that is set as the emulator
125
184
    base class, not the class that is doing the selecting (which will be the
246
    base class, not the class that is doing the selecting. Using the passed id
126
185
    'default_class' parameter).
247
    we retrieve the relevant bases from the object registry.
127
186
248
129
187
    :param default_class: default class to use if no bases match
249
    :param id: The object id (_id attribute) of the class doing the lookup.
130
188
    :param name: name of new class
250
    :param name: name of new class
131
189
    :returns: custom proxy object class
251
    :returns: custom proxy object class
132
190
252
133
191
253
134
=== modified file 'autopilot/introspection/_search.py'
135
--- autopilot/introspection/_search.py	2015-04-02 08:27:42 +0000
136
+++ autopilot/introspection/_search.py	2015-05-06 10:03:54 +0000
137
@@ -387,12 +387,15 @@
138
387
    # make sure we always have an emulator base. Either use the one the user
387
    # make sure we always have an emulator base. Either use the one the user
139
388
    # gave us, or make one:
388
    # gave us, or make one:
140
389
    emulator_base = emulator_base or _make_default_emulator_base()
389
    emulator_base = emulator_base or _make_default_emulator_base()
141
390
    _raise_if_base_class_not_actually_base(emulator_base)
142
391
143
390
    # Get the dbus introspection Xml for the backend.
392
    # Get the dbus introspection Xml for the backend.
144
391
    intro_xml = _get_introspection_xml_from_backend(dbus_address)
393
    intro_xml = _get_introspection_xml_from_backend(dbus_address)
145
392
    try:
394
    try:
146
393
        # Figure out if the backend has any extension methods, and return
395
        # Figure out if the backend has any extension methods, and return
147
394
        # classes that understand how to use each of those extensions:
396
        # classes that understand how to use each of those extensions:
148
395
        extension_classes = _get_proxy_bases_from_introspection_xml(intro_xml)
397
        extension_classes = _get_proxy_bases_from_introspection_xml(intro_xml)
149
398
150
396
        # Register those base classes for everything that will derive from this
399
        # Register those base classes for everything that will derive from this
151
397
        # emulator base class.
400
        # emulator base class.
152
398
        _object_registry.register_extension_classes_for_proxy_base(
401
        _object_registry.register_extension_classes_for_proxy_base(
153
@@ -427,6 +430,38 @@
154
427
    return type("DefaultEmulatorBase", (ap_dbus.DBusIntrospectionObject,), {})
430
    return type("DefaultEmulatorBase", (ap_dbus.DBusIntrospectionObject,), {})
155
428
431
156
429
432
157
433
WRONG_CPO_CLASS_MSG = '''\
158
434
base_class: {passed} does not appear to be the actual base CPO class.
159
435
Perhaps you meant to use: {actual}.'''
160
436
161
437
162
438
def _raise_if_base_class_not_actually_base(base_class):
163
439
    """Raises ValueError if the provided base_class is not actually the
164
440
       base_class
165
441
166
442
    To ensure that the expected base classes are used when creating proxy
167
443
    objects.
168
444
169
445
    :param base_class: The base class to check.
170
446
    :raises ValueError: The actual base class is not the one provided
171
447
172
448
    """
173
449
    actual_base_class = base_class
174
450
    for cls in base_class.mro():
175
451
        if hasattr(cls, '_id'):
176
452
            actual_base_class = cls
177
453
178
454
    if actual_base_class != base_class:
179
455
        raise(
180
456
            ValueError(
181
457
                WRONG_CPO_CLASS_MSG.format(
182
458
                    passed=base_class,
183
459
                    actual=actual_base_class
184
460
                )
185
461
            )
186
462
        )
187
463
188
464
189
430
def _make_proxy_object_async(
465
def _make_proxy_object_async(
190
431
        data_source, emulator_base, reply_handler, error_handler):
466
        data_source, emulator_base, reply_handler, error_handler):
191
432
    """Make a proxy object for a dbus backend.
467
    """Make a proxy object for a dbus backend.
192
433
468
193
=== modified file 'autopilot/tests/functional/test_introspection_features.py'
194
--- autopilot/tests/functional/test_introspection_features.py	2015-02-26 00:40:54 +0000
195
+++ autopilot/tests/functional/test_introspection_features.py	2015-05-06 10:03:54 +0000
196
@@ -24,7 +24,7 @@
197
24
import subprocess
24
import subprocess
198
25
import tempfile
25
import tempfile
199
26
from tempfile import mktemp
26
from tempfile import mktemp
201
27
from testtools import skip, skipIf
27
from testtools import skipIf
202
28
from testtools.matchers import (
28
from testtools.matchers import (
203
29
    Contains,
29
    Contains,
204
30
    Equals,
30
    Equals,
205
@@ -36,6 +36,7 @@
206
36
    StartsWith,
36
    StartsWith,
207
37
)
37
)
208
38
from textwrap import dedent
38
from textwrap import dedent
209
39
from unittest.mock import patch
210
39
from io import StringIO
40
from io import StringIO
211
40
41
212
41
from autopilot import platform
42
from autopilot import platform
213
@@ -43,6 +44,8 @@
214
43
from autopilot.testcase import AutopilotTestCase
44
from autopilot.testcase import AutopilotTestCase
215
44
from autopilot.tests.functional.fixtures import TempDesktopFile
45
from autopilot.tests.functional.fixtures import TempDesktopFile
216
45
from autopilot.introspection import CustomEmulatorBase
46
from autopilot.introspection import CustomEmulatorBase
217
47
from autopilot.introspection import _object_registry as object_registry
218
48
from autopilot.introspection import _search
219
46
from autopilot.introspection.qt import QtObjectProxyMixin
49
from autopilot.introspection.qt import QtObjectProxyMixin
220
47
from autopilot.display import Display
50
from autopilot.display import Display
221
48
51
222
@@ -99,7 +102,6 @@
223
99
            Equals(WindowMockerApp)
102
            Equals(WindowMockerApp)
224
100
        )
103
        )
225
101
104
226
102
    @skip("Currently fails due to lp:1425721 (and lp:1376996)")
227
103
    def test_customised_proxy_classes_have_extension_classes(self):
105
    def test_customised_proxy_classes_have_extension_classes(self):
228
104
        class WindowMockerApp(EmulatorBase):
106
        class WindowMockerApp(EmulatorBase):
229
105
            @classmethod
107
            @classmethod
230
@@ -109,6 +111,49 @@
231
109
        app = self.start_mock_app(EmulatorBase)
111
        app = self.start_mock_app(EmulatorBase)
232
110
        self.assertThat(app.__class__.__bases__, Contains(QtObjectProxyMixin))
112
        self.assertThat(app.__class__.__bases__, Contains(QtObjectProxyMixin))
233
111
113
234
114
    def test_customised_proxy_classes_have_multiple_extension_classes(self):
235
115
        with object_registry.patch_registry({}):
236
116
            class SecondEmulatorBase(CustomEmulatorBase):
237
117
                pass
238
118
239
119
            class WindowMockerApp(EmulatorBase, SecondEmulatorBase):
240
120
                @classmethod
241
121
                def validate_dbus_object(cls, path, _state):
242
122
                    return path == b'/window-mocker'
243
123
244
124
            app = self.start_mock_app(EmulatorBase)
245
125
            self.assertThat(app.__class__.__bases__, Contains(EmulatorBase))
246
126
            self.assertThat(
247
127
                app.__class__.__bases__,
248
128
                Contains(SecondEmulatorBase)
249
129
            )
250
130
251
131
    def test_handles_using_app_cpo_base_class(self):
252
132
        # This test replicates an issue found in an application test suite
253
133
        # where using the App CPO caused an exception.
254
134
        with object_registry.patch_registry({}):
255
135
            class WindowMockerApp(CustomEmulatorBase):
256
136
                @classmethod
257
137
                def validate_dbus_object(cls, path, _state):
258
138
                    return path == b'/window-mocker'
259
139
260
140
            self.start_mock_app(WindowMockerApp)
261
141
262
142
    def test_warns_when_using_incorrect_cpo_base_class(self):
263
143
        # Ensure the warning method is called when launching a proxy.
264
144
        with object_registry.patch_registry({}):
265
145
            class TestCPO(CustomEmulatorBase):
266
146
                pass
267
147
268
148
            class WindowMockerApp(TestCPO):
269
149
                @classmethod
270
150
                def validate_dbus_object(cls, path, _state):
271
151
                    return path == b'/window-mocker'
272
152
273
153
            with patch.object(_search, 'logger') as p_logger:
274
154
                self.start_mock_app(WindowMockerApp)
275
155
                self.assertTrue(p_logger.warning.called)
276
156
277
112
    def test_can_select_custom_emulators_by_name(self):
157
    def test_can_select_custom_emulators_by_name(self):
278
113
        """Must be able to select a custom emulator type by name."""
158
        """Must be able to select a custom emulator type by name."""
279
114
        class MouseTestWidget(EmulatorBase):
159
        class MouseTestWidget(EmulatorBase):
280
115
160
281
=== modified file 'autopilot/tests/unit/test_introspection_object_registry.py'
282
--- autopilot/tests/unit/test_introspection_object_registry.py	2014-07-31 04:42:08 +0000
283
+++ autopilot/tests/unit/test_introspection_object_registry.py	2015-05-06 10:03:54 +0000
284
@@ -1,7 +1,7 @@
285
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
286
2
#
2
#
287
3
# Autopilot Functional Test Tool
3
# Autopilot Functional Test Tool
289
4
# Copyright (C) 2014 Canonical
4
# Copyright (C) 2014, 2015 Canonical
290
5
#
5
#
291
6
# This program is free software: you can redistribute it and/or modify
6
# This program is free software: you can redistribute it and/or modify
292
7
# it under the terms of the GNU General Public License as published by
7
# it under the terms of the GNU General Public License as published by
293
@@ -263,3 +263,149 @@
294
263
        with object_registry.patch_registry(dict()):
263
        with object_registry.patch_registry(dict()):
295
264
            object_registry._object_registry[token] = token
264
            object_registry._object_registry[token] = token
296
265
        self.assertFalse(token in object_registry._object_registry)
265
        self.assertFalse(token in object_registry._object_registry)
297
266
298
267
299
268
class CombineBasesTests(TestCase):
300
269
    def test_returns_original_if_no_extensions(self):
301
270
        class Base():
302
271
            pass
303
272
304
273
        class Sub(Base):
305
274
            pass
306
275
307
276
        self.assertEqual(
308
277
            object_registry._combine_base_and_extensions(Sub, ()),
309
278
            (Base,)
310
279
        )
311
280
312
281
    def test_returns_addition_of_extension_classes(self):
313
282
        class Base():
314
283
            pass
315
284
316
285
        class Sub(Base):
317
286
            pass
318
287
319
288
        class Ext1():
320
289
            pass
321
290
322
291
        class Ext2():
323
292
            pass
324
293
325
294
        mixed = object_registry._combine_base_and_extensions(Sub, (Ext1, Ext2))
326
295
327
296
        self.assertIn(Ext1, mixed)
328
297
        self.assertIn(Ext2, mixed)
329
298
330
299
    def test_excludes_duplication_of_base_class_within_extension_classes(self):
331
300
        class Base():
332
301
            pass
333
302
334
303
        class Sub(Base):
335
304
            pass
336
305
337
306
        class Ext1():
338
307
            pass
339
308
340
309
        class Ext2(Ext1):
341
310
            pass
342
311
343
312
        self.assertEqual(
344
313
            object_registry._combine_base_and_extensions(Sub, (Ext2, Base)),
345
314
            (Ext2, Base,)
346
315
        )
347
316
348
317
    def test_excludes_addition_of_extension_base_classes(self):
349
318
        class Base():
350
319
            pass
351
320
352
321
        class Sub(Base):
353
322
            pass
354
323
355
324
        class Ext1():
356
325
            pass
357
326
358
327
        class Ext2(Ext1):
359
328
            pass
360
329
361
330
        self.assertNotIn(
362
331
            object_registry._combine_base_and_extensions(Sub, (Ext2,)),
363
332
            Ext1
364
333
        )
365
334
366
335
    def test_excludes_addition_of_subject_class(self):
367
336
        class Base():
368
337
            pass
369
338
370
339
        class Sub(Base):
371
340
            pass
372
341
373
342
        class Ext1():
374
343
            pass
375
344
376
345
        self.assertEqual(
377
346
            object_registry._combine_base_and_extensions(Sub, (Ext1, Sub)),
378
347
            (Ext1, Base)
379
348
        )
380
349
381
350
    def test_maintains_mro_order(self):
382
351
        class Base():
383
352
            pass
384
353
385
354
        class Sub1(Base):
386
355
            pass
387
356
388
357
        class Sub2(Sub1, Base):
389
358
            pass
390
359
391
360
        class Ext1():
392
361
            pass
393
362
394
363
        mixed = object_registry._combine_base_and_extensions(Sub2, (Ext1,))
395
364
396
365
        self.assertLess(
397
366
            mixed.index(Sub1),
398
367
            mixed.index(Base)
399
368
        )
400
369
401
370
402
371
class MROSortOrderTests(TestCase):
403
372
    def test_returns_lower_values_for_lower_classes_in_mro(self):
404
373
        class Parent():
405
374
            pass
406
375
407
376
        class Child(Parent):
408
377
            pass
409
378
410
379
        class GrandChild(Child):
411
380
            pass
412
381
413
382
        self.assertGreater(
414
383
            object_registry._get_mro_sort_order(Child),
415
384
            object_registry._get_mro_sort_order(Parent),
416
385
        )
417
386
        self.assertGreater(
418
387
            object_registry._get_mro_sort_order(GrandChild),
419
388
            object_registry._get_mro_sort_order(Child),
420
389
        )
421
390
422
391
    def test_return_higher_values_for_promoted_collections_in_ties(self):
423
392
        class Parent1():
424
393
            pass
425
394
426
395
        class Child1(Parent1):
427
396
            pass
428
397
429
398
        class Parent2():
430
399
            pass
431
400
432
401
        class Child2(Parent2):
433
402
            pass
434
403
435
404
        promoted_collection = (Parent1, Child1)
436
405
437
406
        self.assertGreater(
438
407
            object_registry._get_mro_sort_order(
439
408
                Child1, promoted_collection),
440
409
            object_registry._get_mro_sort_order(
441
410
                Child2, promoted_collection),
442
411
        )
443
266
412
444
=== modified file 'autopilot/tests/unit/test_introspection_search.py'
445
--- autopilot/tests/unit/test_introspection_search.py	2015-04-02 08:27:42 +0000
446
+++ autopilot/tests/unit/test_introspection_search.py	2015-05-06 10:03:54 +0000
447
@@ -34,6 +34,8 @@
448
34
from autopilot.exceptions import ProcessSearchError
34
from autopilot.exceptions import ProcessSearchError
449
35
from autopilot.utilities import sleep
35
from autopilot.utilities import sleep
450
36
from autopilot.introspection import _search as _s
36
from autopilot.introspection import _search as _s
451
37
452
38
from autopilot.introspection import CustomEmulatorBase
453
37
from autopilot.introspection.constants import AUTOPILOT_PATH
39
from autopilot.introspection.constants import AUTOPILOT_PATH
454
38
40
455
39
41
456
@@ -730,3 +732,95 @@
457
730
                _s._find_matching_connections(bus, lambda *args: True)
732
                _s._find_matching_connections(bus, lambda *args: True)
458
731
733
459
732
                dedupe.assert_called_once_with(["conn1"], bus)
734
                dedupe.assert_called_once_with(["conn1"], bus)
460
735
461
736
462
737
class ActualBaseClassTests(TestCase):
463
738
464
739
    def test_dont_raise_passed_base_when_is_only_base(self):
465
740
        class ActualBase(CustomEmulatorBase):
466
741
            pass
467
742
468
743
        try:
469
744
            _s._raise_if_base_class_not_actually_base(ActualBase)
470
745
        except ValueError:
471
746
            self.fail('Unexpected ValueError exception')
472
747
473
748
    def test_raises_if_passed_incorrect_base_class(self):
474
749
        class ActualBase(CustomEmulatorBase):
475
750
            pass
476
751
477
752
        class InheritedCPO(ActualBase):
478
753
            pass
479
754
480
755
        self.assertRaises(
481
756
            ValueError,
482
757
            _s._raise_if_base_class_not_actually_base,
483
758
            InheritedCPO
484
759
        )
485
760
486
761
    def test_raises_parent_with_simple_non_ap_multi_inheritance(self):
487
762
        """When mixing in non-customproxy classes must return the base."""
488
763
489
764
        class ActualBase(CustomEmulatorBase):
490
765
            pass
491
766
492
767
        class InheritedCPO(ActualBase):
493
768
            pass
494
769
495
770
        class TrickyOne(object):
496
771
            pass
497
772
498
773
        class FinalForm(InheritedCPO, TrickyOne):
499
774
            pass
500
775
501
776
        self.assertRaises(
502
777
            ValueError,
503
778
            _s._raise_if_base_class_not_actually_base,
504
779
            FinalForm
505
780
        )
506
781
507
782
    def test_raises_parent_with_non_ap_multi_inheritance(self):
508
783
509
784
        class ActualBase(CustomEmulatorBase):
510
785
            pass
511
786
512
787
        class InheritedCPO(ActualBase):
513
788
            pass
514
789
515
790
        class TrickyOne(object):
516
791
            pass
517
792
518
793
        class FinalForm(TrickyOne, InheritedCPO):
519
794
            pass
520
795
521
796
        self.assertRaises(
522
797
            ValueError,
523
798
            _s._raise_if_base_class_not_actually_base,
524
799
            FinalForm
525
800
        )
526
801
527
802
    def test_dont_raise_when_using_default_emulator_base(self):
528
803
        # _make_proxy_object potentially creates a default base.
529
804
        DefaultBase = _s._make_default_emulator_base()
530
805
        try:
531
806
            _s._raise_if_base_class_not_actually_base(DefaultBase)
532
807
        except ValueError:
533
808
            self.fail('Unexpected ValueError exception')
534
809
535
810
    def test_exception_message_contains_useful_information(self):
536
811
        class ActualBase(CustomEmulatorBase):
537
812
            pass
538
813
539
814
        class InheritedCPO(ActualBase):
540
815
            pass
541
816
542
817
        try:
543
818
            _s._raise_if_base_class_not_actually_base(InheritedCPO)
544
819
        except ValueError as err:
545
820
            self.assertEqual(
546
821
                str(err),
547
822
                _s.WRONG_CPO_CLASS_MSG.format(
548
823
                    passed=InheritedCPO,
549
824
                    actual=ActualBase
550
825
                )
551
826
            )
552
733
827
553
=== removed file 'debian/autopilot-touch.dirs'
554
--- debian/autopilot-touch.dirs	2013-09-20 19:06:30 +0000
555
+++ debian/autopilot-touch.dirs	1970-01-01 00:00:00 +0000
556
@@ -1,1 +0,0 @@
557
1
usr/share/autopilot-touch/apparmor
558
2
0
559
=== removed file 'debian/autopilot-touch.install'
560
--- debian/autopilot-touch.install	2013-09-20 19:06:30 +0000
561
+++ debian/autopilot-touch.install	1970-01-01 00:00:00 +0000
562
@@ -1,1 +0,0 @@
563
1
apparmor/click.rules usr/share/autopilot-touch/apparmor
564
2
0
565
=== modified file 'debian/changelog'
566
--- debian/changelog	2015-02-26 21:20:18 +0000
567
+++ debian/changelog	2015-05-06 10:03:54 +0000
568
@@ -1,12 +1,19 @@
569
1
autopilot (1.5.0) UNRELEASED; urgency=medium
1
autopilot (1.5.0) UNRELEASED; urgency=medium
570
2
2
571
3
  [ Christopher Lee ]
572
3
  * Fix for desktop file name change (lp:1411096)
4
  * Fix for desktop file name change (lp:1411096)
573
4
    Fix for config value containing '=' char (lp:1408317)
5
    Fix for config value containing '=' char (lp:1408317)
574
5
    Fix for skipped tests not appearing in log (lp:1414632)
6
    Fix for skipped tests not appearing in log (lp:1414632)
575
6
    Add json docs build (for web publish) (lp:1409778)
7
    Add json docs build (for web publish) (lp:1409778)
576
7
    Documentation improvements for API, Tutorial, FAQ, and Guidelines
8
    Documentation improvements for API, Tutorial, FAQ, and Guidelines
577
8
9
579
9
 -- Christopher Lee <chris.lee@canonical.com>  Fri, 27 Feb 2015 10:16:42 +1300
10
  [ Vincent Ladeuil ]
580
11
  * Remove apparmor/click.rules which is now shipped by dbus-property-service.
581
12
582
13
  [ Federico Gimenez ]
583
14
  * Fixed CPO class resolution (lp:1425721, lp:1376996)
584
15
585
16
 -- Federico Gimenez <fgimenez@canonical.com>  mon, 4 May 2015 12:12:42 +0200
586
10
17
587
11
autopilot (1.5.0+15.04.20141031-0ubuntu1) vivid; urgency=low
18
autopilot (1.5.0+15.04.20141031-0ubuntu1) vivid; urgency=low
588
12
19
589
13
20
590
=== modified file 'debian/rules' (properties changed: -x to +x)
Status:	Merged
Approved by:	Christopher Lee on 2015-05-08
Approved revision:	578
Merged at revision:	554
Proposed branch:	lp:~canonical-platform-qa/autopilot/cpo-base-classes-fix
Merge into:	lp:autopilot
Diff against target:	590 lines (+399/-24) 9 files modified apparmor/click.rules (+0/-12) autopilot/introspection/_object_registry.py (+68/-6) autopilot/introspection/_search.py (+35/-0) autopilot/tests/functional/test_introspection_features.py (+47/-2) autopilot/tests/unit/test_introspection_object_registry.py (+147/-1) autopilot/tests/unit/test_introspection_search.py (+94/-0) debian/autopilot-touch.dirs (+0/-1) debian/autopilot-touch.install (+0/-1) debian/changelog (+8/-1)
To merge this branch:	bzr merge lp:~canonical-platform-qa/autopilot/cpo-base-classes-fix
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-05-07
Christopher Lee (community)		2015-04-28	Needs Information on 2015-05-06
Review via email: mp+257623@code.launchpad.net