Merge lp:~thomir-deactivatedaccount/autopilot/remove-incompatible-changes into lp:autopilot/1.3

[Thomi Richards]

Back out changes that would break test case compatibility.

This branch removes the changes that makes autopilot incompatible with test cases. Namely, it removes the following:

 * Addition of the wait_select_single method.
 * Change to make select-single raise a StateNotFound error instead of returning None.

[Leo Arias (elopio)]

Sad, but sane. Thanks.

review: Approve (code review.)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:332
http://jenkins.qa.ubuntu.com/job/autopilot-1.3-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.3-saucy-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.3-saucy-armhf-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.3-saucy-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-1.3-ci/17/rebuild

review: Approve (continuous-integration)

=== modified file 'autopilot/introspection/dbus.py'
--- autopilot/introspection/dbus.py	2013-09-16 15:22:01 +0000
+++ autopilot/introspection/dbus.py	2013-09-17 15:59:21 +0000
@@ -168,7 +168,6 @@
         self.__refresh_on_attribute = True
         self._set_properties(state_dict)
         self._path = path
-        self._poll_time = 10
 
     def _set_properties(self, state_dict):
         """Creates and set attributes of *self* based on contents of
@@ -360,8 +359,7 @@
             app.select_single('QPushButton', objectName='clickme')
             # returns a QPushButton whose 'objectName' property is 'clickme'.
 
-        If nothing is returned from the query, this method raises
-        StateNotFoundError.
+        If nothing is returned from the query, this method returns None.
 
         :param type_name: Either a string naming the type you want, or a class
             of the appropriate type (the latter case is for overridden emulator
@@ -373,8 +371,6 @@
         :raises TypeError: if neither *type_name* or keyword filters are
             provided.
 
-        :raises StateNotFoundError: if the requested object was not found.
-
         .. seealso::
             Tutorial Section :ref:`custom_emulators`
 
@@ -383,42 +379,9 @@
         if len(instances) > 1:
             raise ValueError("More than one item was returned for query")
         if not instances:
-            raise StateNotFoundError(type_name, **kwargs)
+            return None
         return instances[0]
 
-    def wait_select_single(self, type_name='*', **kwargs):
-        """Does the same thing as :meth:`select_single`, but will poll the
-        application continually until a valid object is found. This is useful
-        in situations where the object you are trying to select may not exist
-        yet.
-
-        After 10 seconds, a StateNotFoundError will be raised, as if the
-        :meth:`select_single` method had been called instead.
-
-        :param type_name: Either a string naming the type you want, or a class
-            of the appropriate type (the latter case is for overridden emulator
-            classes).
-
-        :raises ValueError: if the query returns more than one item. *If
-            you want more than one item, use select_many instead*.
-
-        :raises TypeError: if neither *type_name* or keyword filters are
-            provided.
-
-        :raises StateNotFoundError: if the requested object was not found.
-
-        .. seealso::
-            Tutorial Section :ref:`custom_emulators`
-
-        """
-        for i in range(self._poll_time):
-            try:
-                return self.select_single(type_name, **kwargs)
-            except StateNotFoundError:
-                if i == self._poll_time - 1:
-                    raise
-                sleep(1)
-
     def select_many(self, type_name='*', **kwargs):
         """Get a list of nodes from the introspection tree, with type equal to
         *type_name* and (optionally) matching the keyword filters present in

=== modified file 'autopilot/tests/functional/test_dbus_query.py'
--- autopilot/tests/functional/test_dbus_query.py	2013-09-16 13:02:23 +0000
+++ autopilot/tests/functional/test_dbus_query.py	2013-09-17 15:59:21 +0000
@@ -22,12 +22,10 @@
 import os
 import subprocess
 import signal
-from time import time
 from tempfile import mktemp
 
 from autopilot.testcase import AutopilotTestCase
-from testtools.matchers import Equals, NotEquals, raises, LessThan, GreaterThan
-from autopilot.introspection.dbus import StateNotFoundError
+from testtools.matchers import Equals, NotEquals, raises
 
 
 class DbusQueryTests(AutopilotTestCase):
@@ -128,10 +126,10 @@
         fn = lambda: app.select_single()
         self.assertThat(fn, raises(TypeError))
 
-    def test_select_single_no_match_raises_exception(self):
+    def test_select_single_no_match_returns_none(self):
         app = self.start_fully_featured_app()
-        match_fn = lambda: app.select_single("QMadeupType")
-        self.assertThat(match_fn, raises(StateNotFoundError('QMadeupType')))
+        failed_match = app.select_single("QMadeupType")
+        self.assertThat(failed_match, Equals(None))
 
     def test_select_single_parameters_only(self):
         app = self.start_fully_featured_app()
@@ -140,13 +138,10 @@
         self.assertThat(titled_help, NotEquals(None))
         self.assertThat(titled_help.title, Equals('Help'))
 
-    def test_select_single_parameters_no_match_raises_exception(self):
+    def test_select_single_parameters_no_match_returns_none(self):
         app = self.start_fully_featured_app()
-        match_fn = lambda: app.select_single(title="Non-existant object")
-        self.assertThat(
-            match_fn,
-            raises(StateNotFoundError(title="Non-existant object"))
-        )
+        failed_match = app.select_single(title="Non-existant object")
+        self.assertThat(failed_match, Equals(None))
 
     def test_select_single_returning_multiple_raises(self):
         app = self.start_fully_featured_app()
@@ -168,23 +163,6 @@
         failed_match = app.select_many('QMenu', title='qwerty')
         self.assertThat(failed_match, Equals([]))
 
-    def test_wait_select_single_succeeds_quickly(self):
-        app = self.start_fully_featured_app()
-        start_time = time()
-        main_window = app.wait_select_single('QMainWindow')
-        end_time = time()
-        self.assertThat(main_window, NotEquals(None))
-        self.assertThat(abs(end_time - start_time), LessThan(1))
-
-    def test_wait_select_single_fails_slowly(self):
-        app = self.start_fully_featured_app()
-        start_time = time()
-        fn = lambda: app.wait_select_single('QMadeupType')
-        self.assertThat(fn, raises(StateNotFoundError('QMadeupType')))
-        end_time = time()
-        self.assertThat(abs(end_time - start_time), GreaterThan(9))
-        self.assertThat(abs(end_time - start_time), LessThan(11))
-
 
 class DbusCustomBusTests(AutopilotTestCase):
     """Test the ability to use custom dbus buses during a test."""