Merge lp:~boiko/dialer-app/fix_autopilot_tests into lp:dialer-app

[Gustavo Pichorim Boiko]

Make sure the telepathy-ofono account is using the correct modem before running the tests.

Make sure the telepathy-ofono account is using the correct modem before running the 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/dialer-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 subscribe a core-dev to this MP?
N/A

[lp:~boiko/dialer-app/fix_autopilot_tests]

115. By Gustavo Pichorim Boiko on 2014-03-24

Fix the comment.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:115
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/212/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-trusty-amd64-ci/117
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-trusty-armhf-ci/119
        deb: http://jenkins.qa.ubuntu.com/job/dialer-app-trusty-armhf-ci/119/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-trusty-i386-ci/117
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4207
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3791
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3654
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4280
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4280/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3793
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3793/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6088
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5156

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

review: Approve (continuous-integration)

[Leo Arias (elopio)]

Ran 9 tests in 112.379s
OK

review: Approve (ran the tests on mako, image 256)

[Leo Arias (elopio)]

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

Yes. This branch changes nothing on the functionality. The autopilot tests leave the phone in a bad state that doesn't let you make or receive more calls, but after removing ofono-phonesim, rebooting and reconnecting to the ofono account, the dialer app works fine for me.

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.

=== modified file 'tests/autopilot/dialer_app/tests/test_calls.py'
--- tests/autopilot/dialer_app/tests/test_calls.py	2014-02-27 01:20:02 +0000
+++ tests/autopilot/dialer_app/tests/test_calls.py	2014-03-24 23:46:01 +0000
@@ -39,6 +39,10 @@
             subprocess.call(["pkill", "history-daemon"])
             os.rename(self.history, self.history + ".orig")
 
+        # make sure the modem is running on phonesim
+        subprocess.call(['mc-tool', 'update', 'ofono/ofono/account0', 'string:modem-objpath=/phonesim'])
+        subprocess.call(['mc-tool', 'reconnect', 'ofono/ofono/account0'])
+
         super(TestCalls, self).setUp()
 
         # should have an empty history at the beginning of each test
@@ -57,6 +61,10 @@
             subprocess.call(["pkill", "history-daemon"])
             os.rename(self.history + ".orig", self.history)
 
+        # set the modem objpath in telepathy-ofono to the real modem
+        subprocess.call(['mc-tool', 'update', 'ofono/ofono/account0', 'string:modem-objpath=/ril_0'])
+        subprocess.call(['mc-tool', 'reconnect', 'ofono/ofono/account0'])
+
     def test_outgoing_noanswer(self):
         """Outgoing call to a normal number, no answer"""
         number = "144"