Merge lp:~tiagosh/messaging-app/online-modem-for-tests into lp:messaging-app

[Tiago Salem Herrmann]

Force modem to go online during tests.

Force modem to go online during tests.

-- Checklist --
Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/messaging-app) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:123
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/252/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1420
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1224
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/46
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/46/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1716
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2373
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2373/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1007
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1370
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1370/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/252/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

[lp:~tiagosh/messaging-app/online-modem-for-tests]

124. By Tiago Salem Herrmann on 2014-07-08

fix test

=== modified file 'tests/autopilot/messaging_app/helpers.py'
--- tests/autopilot/messaging_app/helpers.py	2014-06-04 17:46:01 +0000
+++ tests/autopilot/messaging_app/helpers.py	2014-07-08 23:14:09 +0000
@@ -11,6 +11,10 @@
 import os
 import shutil
 import tempfile
+import subprocess
+import sys
+import time
+from dbus import exceptions
 
 
 def receive_sms(sender, text):
@@ -38,3 +42,65 @@
     script_proxy.SetPath(script_dir)
     script_proxy.Run("sms.js")
     shutil.rmtree(script_dir)
+
+
+def get_phonesim():
+    bus = dbus.SystemBus()
+    try:
+        manager = dbus.Interface(bus.get_object('org.ofono', '/'),
+                                 'org.ofono.Manager')
+    except dbus.exceptions.DBusException:
+        return False
+
+    modems = manager.GetModems()
+
+    for path, properties in modems:
+        if path == '/phonesim':
+            return properties
+
+    return None
+
+
+def is_phonesim_running():
+    """Determine whether we are running with phonesim."""
+    phonesim = get_phonesim()
+    return phonesim is not None
+
+
+def ensure_ofono_account():
+    # oFono modems are now set online by NetworkManager, so for the tests
+    # we need to manually put them online.
+    subprocess.check_call(['/usr/share/ofono/scripts/enable-modem',
+                           '/phonesim'])
+    subprocess.check_call(['/usr/share/ofono/scripts/online-modem',
+                           '/phonesim'])
+
+    # wait until the modem is actually online
+    for index in range(10):
+        phonesim = get_phonesim()
+        if phonesim['Online'] == 1:
+            break
+        time.sleep(1)
+    else:
+        raise exceptions.RuntimeError("oFono simulator didn't get online.")
+
+    # this is a bit drastic, but sometimes mission-control-5 won't recognize
+    # clients installed after it was started, so, we make sure it gets
+    # restarted
+    subprocess.check_call(['pkill', '-9', 'mission-control'])
+
+    if not _is_ofono_account_set():
+        subprocess.check_call(['ofono-setup'])
+        if not _is_ofono_account_set():
+            sys.stderr.write('ofono-setup failed to create ofono account!\n')
+            sys.exit(1)
+
+
+def _is_ofono_account_set():
+    mc_tool = subprocess.Popen(
+        [
+            'mc-tool',
+            'list',
+        ], stdout=subprocess.PIPE, universal_newlines=True)
+    mc_accounts = mc_tool.communicate()[0]
+    return 'ofono/ofono/account' in mc_accounts

=== modified file 'tests/autopilot/messaging_app/tests/__init__.py'
--- tests/autopilot/messaging_app/tests/__init__.py	2014-06-25 07:21:10 +0000
+++ tests/autopilot/messaging_app/tests/__init__.py	2014-07-08 23:14:09 +0000
@@ -16,29 +16,17 @@
 from testtools.matchers import Equals
 
 from ubuntuuitoolkit import emulators as toolkit_emulators
-from messaging_app import emulators
+from messaging_app import emulators, helpers
 
 import os
-import sys
 import logging
 import subprocess
 
 logger = logging.getLogger(__name__)
 
-
 # ensure we have an ofono account; we assume that we have these tools,
 # otherwise we consider this a test failure (missing dependencies)
-def tp_has_ofono():
-    mc_tool = subprocess.Popen(['mc-tool', 'list'], stdout=subprocess.PIPE,
-                               universal_newlines=True)
-    mc_accounts = mc_tool.communicate()[0]
-    return 'ofono/ofono/account' in mc_accounts
-
-if not tp_has_ofono():
-    subprocess.check_call(['ofono-setup'])
-    if not tp_has_ofono():
-        sys.stderr.write('ofono-setup failed to create ofono account!\n')
-        sys.exit(1)
+helpers.ensure_ofono_account()
 
 
 class MessagingAppTestCase(AutopilotTestCase):