Merge lp:~elopio/reminders-app/autopilot_namespace_breakage into lp:reminders-app

[Leo Arias]

Workaround for the API breakage on autopilot 1.5 that moved get_classname_from_path to a private module.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:140
http://91.189.93.70:8080/job/reminders-app-ci/358/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2660
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2660/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/197
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/197/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/359
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/53

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/358/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

LGTM and most importantly it now makes Jenkins happy, nice work!

review: Approve

=== modified file 'tests/autopilot/reminders/__init__.py'
--- tests/autopilot/reminders/__init__.py	2014-04-04 17:49:32 +0000
+++ tests/autopilot/reminders/__init__.py	2014-05-16 06:52:57 +0000
@@ -19,7 +19,9 @@
 """Reminders app tests and emulators - top level package."""
 
 import logging
+from distutils import version
 
+import autopilot
 from autopilot import logging as autopilot_logging
 from autopilot.introspection import dbus
 from ubuntuuitoolkit import emulators as toolkit_emulators
@@ -65,7 +67,15 @@
 
     @classmethod
     def validate_dbus_object(cls, path, state):
-        name = dbus.get_classname_from_path(path)
+        if (version.LooseVersion(autopilot.version) >=
+                version.LooseVersion('1.5')):
+            # TODO there's an autopilot branch that will put the function in a
+            # public module. Update this once the branch is released.
+            # --elopio - 2014-05-16
+            from autopilot.introspection import _xpathselect
+            name = _xpathselect.get_classname_from_path(path)
+        else:
+            name = dbus.get_classname_from_path(path)
         if name == 'Dialog':
             if 'noAccountDialog' == state['objectName'][1]:
                 return True