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

[Gustavo Pichorim Boiko]

Select the correct dialer page on autopilot tests.

Select the correct dialer page on autopilot 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/<package-name>) on device or emulator?
Yep

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

If you changed UI labels, did you update the pot file?
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)]

FAILED: Continuous integration, rev:360
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/514/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/24
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1309
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/602
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1307
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1307/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17979
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/489
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/712
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/712/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

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

361. By Gustavo Pichorim Boiko on 2015-02-13

Run history-daemon using a database on /tmp to be able to update the schema
when necessary.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:361
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/515/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/25
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1363
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/621
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1202
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1361
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1361/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18065
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/502
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/731
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/731/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

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

362. By Gustavo Pichorim Boiko on 2015-02-16

Fix a race condition.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:362
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/516/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/26
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1381/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/626/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1219/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1379
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1379/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18095
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/507/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/736
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/736/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Needs top-approval for publishing.

[Tiago Salem Herrmann (tiagosh)]

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.
No, but not related to the changes.

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

review: Approve

=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
--- src/qml/LiveCallPage/LiveCall.qml	2015-01-23 21:01:30 +0000
+++ src/qml/LiveCallPage/LiveCall.qml	2015-02-16 18:25:52 +0000
@@ -17,7 +17,6 @@
  */
 
 import QtQuick 2.0
-import QtGraphicalEffects 1.0
 import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 0.1 as ListItems
 import Ubuntu.Components.Popups 0.1
@@ -129,7 +128,7 @@
             callObject["held"] = call.held;
             callObject["muted"] = call.muted;
             callObject["activeAudioOutput"] = call.activeAudioOutput;
-            callObject["audioOutputs"] = call.audioOutputs;
+            callObject["audioOutputs"] = [];
             callObject["isConference"] = call.isConference;
 
             reportStatus(callObject, i18n.tr("Call ended"));

=== modified file 'tests/autopilot/dialer_app/ListItemWithActions.py'
--- tests/autopilot/dialer_app/ListItemWithActions.py	2014-09-02 23:04:30 +0000
+++ tests/autopilot/dialer_app/ListItemWithActions.py	2015-02-16 18:25:52 +0000
@@ -23,7 +23,6 @@
         self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
 
 
-
 class HistoryDelegate(ListItemWithActions):
 
     """Autopilot helper for the History delegate."""
@@ -45,4 +44,3 @@
         self._show_actions()
         icon = self.select_single('Icon11', name='contact-new')
         self.pointing_device.click_object(icon)
-

=== modified file 'tests/autopilot/dialer_app/__init__.py'
--- tests/autopilot/dialer_app/__init__.py	2014-08-14 17:19:48 +0000
+++ tests/autopilot/dialer_app/__init__.py	2015-02-16 18:25:52 +0000
@@ -22,7 +22,7 @@
 
     @property
     def dialer_page(self):
-        return self.wait_select_single(DialerPage)
+        return self.wait_select_single(DialerPage, greeterMode=False)
 
     @property
     def live_call_page(self):

=== modified file 'tests/autopilot/dialer_app/tests/test_calls.py'
--- tests/autopilot/dialer_app/tests/test_calls.py	2015-01-28 21:11:15 +0000
+++ tests/autopilot/dialer_app/tests/test_calls.py	2015-02-16 18:25:52 +0000
@@ -179,12 +179,12 @@
         formattedNumber2 = "1 231-234-567"
 
         self.main_view.dialer_page.call_number(number, formattedNumber)
-        time.sleep(1)
+        time.sleep(3)
         self.main_view.live_call_page.click_hangup_button()
         self.main_view.dialer_page.active.wait_for(True)
 
         self.main_view.dialer_page.call_number(number2, formattedNumber2)
-        time.sleep(1)
+        time.sleep(3)
         self.main_view.live_call_page.click_hangup_button()
         self.main_view.dialer_page.active.wait_for(True)
 
@@ -194,4 +194,5 @@
         historyEntry = self.get_history_for_number(number)
         self.main_view._click_button(historyEntry)
         self.assertThat(
-            self.main_view.dialer_page.dialNumber, Eventually(Equals(formattedNumber2)))
+            self.main_view.dialer_page.dialNumber,
+            Eventually(Equals(formattedNumber2)))

=== modified file 'tests/autopilot/dialer_app/tests/test_logs.py'
--- tests/autopilot/dialer_app/tests/test_logs.py	2014-09-02 22:55:43 +0000
+++ tests/autopilot/dialer_app/tests/test_logs.py	2015-02-16 18:25:52 +0000
@@ -11,6 +11,7 @@
 """Tests for the Dialer App"""
 
 import os
+import shutil
 import subprocess
 
 from autopilot.platform import model
@@ -35,6 +36,7 @@
     db_file = 'history.sqlite'
     local_db_dir = 'dialer_app/data/'
     system_db_dir = '/usr/lib/python3/dist-packages/dialer_app/data/'
+    temp_db_file = '/tmp/' + db_file
 
     def setUp(self):
         if os.path.exists('../../src/dialer-app'):
@@ -42,8 +44,13 @@
         else:
             database = self.system_db_dir + self.db_file
 
+        if os.path.exists(self.temp_db_file):
+            os.remove(self.temp_db_file)
+
+        shutil.copyfile(database, self.temp_db_file)
+
         subprocess.call(['pkill', 'history-daemon'])
-        os.environ['HISTORY_SQLITE_DBPATH'] = database
+        os.environ['HISTORY_SQLITE_DBPATH'] = self.temp_db_file
         with open(os.devnull, 'w') as devnull:
             subprocess.Popen(['history-daemon'], stderr=devnull)