Merge lp:~veebers/autopilot/1.6-OR-removal_from-proxy-object into lp:autopilot

[Christopher Lee]

Provide classmethod to instantiate a Custom Proxy Object instance from an existing proxy object (Generated default or Custom.)

Provide classmethod to instantiate a Custom Proxy Object instance from an existing proxy object (Generated default or Custom.)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:581
http://jenkins.qa.ubuntu.com/job/autopilot-ci/1091/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/22/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/22/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:581
http://jenkins.qa.ubuntu.com/job/autopilot-ci/1093/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/24/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/23/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/24/console

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

review: Needs Fixing (continuous-integration)

[lp:~veebers/autopilot/1.6-OR-removal_from-proxy-object]

582. By Christopher Lee on 2015-06-23

Pyflakes fix.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:582
http://jenkins.qa.ubuntu.com/job/autopilot-ci/1095/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/26/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/26/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3281
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2738
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3279
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3279/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21381

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:581
http://jenkins.qa.ubuntu.com/job/autopilot-ci/1096/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/27/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/26/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/27/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3282
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2739
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3280
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3280/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21382

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

review: Approve (continuous-integration)

[Max Brustkern (nuclearbob)]

Seems reasonable to me.

review: Approve

[lp:~veebers/autopilot/1.6-OR-removal_from-proxy-object]

583. By Christopher Lee on 2015-06-26

Merge pre-req. changes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:583
http://jenkins.qa.ubuntu.com/job/autopilot-ci/1099/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/30/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/29/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/30/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3317
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2773
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3315
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3315/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21497

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

review: Approve (continuous-integration)

[Max Brustkern (nuclearbob)]

Those changes look fine here as well.

review: Approve

[lp:~veebers/autopilot/1.6-OR-removal_from-proxy-object]

584. By Christopher Lee on 2015-07-19

Merge pre-req. updates.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:584
http://jenkins.qa.ubuntu.com/job/autopilot-ci/1120/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/50
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/50/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/49
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/49/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/50
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/50/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3454/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2878/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3451
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3451/artifact/work/output/*zip*/output.zip
    None: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22001/console

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

review: Approve (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:584
https://platform-qa-jenkins.ubuntu.com/job/autopilot-ci/5/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/5/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/autopilot-ci/5/rebuild

review: Approve (continuous-integration)

Unmerged revisions

584. By Christopher Lee on 2015-07-19

Merge pre-req. updates.

583. By Christopher Lee on 2015-06-26

Merge pre-req. changes.

582. By Christopher Lee on 2015-06-23

Pyflakes fix.

581. By Christopher Lee on 2015-06-23

Merge pre-req changes

580. By Christopher Lee on 2015-06-19

Minor spelling mistake fix.

579. By Christopher Lee on 2015-06-19

Pyflakes fix

578. By Christopher Lee on 2015-06-19

Added note on from_proxy_object

577. By Christopher Lee on 2015-06-18

Merge pre req branch changes

576. By Christopher Lee on 2015-06-18

Merge pre req. branch updates.

575. By Christopher Lee on 2015-06-16

Make tests pass (slight update to test)

=== modified file 'autopilot/introspection/dbus.py'
--- autopilot/introspection/dbus.py	2015-07-21 03:28:53 +0000
+++ autopilot/introspection/dbus.py	2015-07-21 03:28:53 +0000
@@ -587,6 +587,30 @@
 
         return cls.__name__
 
+    @classmethod
+    def from_proxy_object(cls, proxy_object):
+        """Return a instantiated proxy object of this class type.
+
+        Creation method that allows a new Custom Proxy Object to be
+        instantiated from an existing CPO Object.
+
+        For instance a query can return a default generated proxy object and
+        then use this method to create a specific CPO from it.
+
+        Note::
+            There is no validation done on the acceptability of the passed
+            proxy object to be instantiated as the calling class.
+            (e.g. validate_dbus_object is not involved.)
+            It is up to the caller to ensure that the passed proxy object is
+            suitable.
+
+        """
+        _, state_dict = proxy_object._get_new_state()
+        path = proxy_object._path
+        backend = proxy_object._backend
+
+        return cls(state_dict, path, backend)
+
 
 # TODO - can we add a deprecation warning around this somehow?
 CustomEmulatorBase = DBusIntrospectionObject

=== modified file 'autopilot/tests/functional/test_introspection_features.py'
--- autopilot/tests/functional/test_introspection_features.py	2015-07-21 03:28:53 +0000
+++ autopilot/tests/functional/test_introspection_features.py	2015-07-21 03:28:53 +0000
@@ -196,6 +196,20 @@
             Not(IsInstance(type(generic_window)))
         )
 
+    def test_object_created_from_proxy_object_methods_are_callable(self):
+        """Creating a proxy object using the 'from_proxy_object' method must
+        ensure that the new objects methods are callable and work.
+
+        """
+        class TestCPO(EmulatorBase):
+            def get_example_window(self):
+                return self.select_single('QMainWindow')
+
+        app = self.start_mock_app(EmulatorBase)
+        new_app = TestCPO.from_proxy_object(app)
+
+        self.assertThat(new_app.get_example_window(), Not(Equals(None)))
+
     def test_print_tree_full(self):
         """Print tree of full application"""
 

=== modified file 'autopilot/tests/unit/test_introspection_dbus.py'
--- autopilot/tests/unit/test_introspection_dbus.py	2015-07-21 03:28:53 +0000
+++ autopilot/tests/unit/test_introspection_dbus.py	2015-07-21 03:28:53 +0000
@@ -109,6 +109,24 @@
                 return "TestCPO"
         self.assertThat(TestCPO.get_type_query_name(), Equals("TestCPO"))
 
+    def test_from_proxy_object_creates_new_cpo_of_expected_type(self):
+        class TestCPO(dbus.DBusIntrospectionObject):
+            pass
+
+        fake_state = dict(id=[0, 123], path=[0, '/some/path'])
+
+        fake_object = dbus.DBusIntrospectionObject(
+            fake_state,
+            b'/root',
+            Mock()
+        )
+
+        with patch.object(fake_object, '_get_new_state') as new_state:
+            new_state.return_value = (None, fake_state)
+            new_object = TestCPO.from_proxy_object(fake_object)
+
+        self.assertEqual(new_object.__class__, TestCPO)
+
 
 class ProxyObjectCreationTests(TestCase):
     def test_default_class_mentioned_in_attr_error(self):