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

[Gustavo Pichorim Boiko]

Select the correct dialpad page on autopilot tests.

Select the correct dialpad page on autopilot tests.

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

266. 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.

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

Fix a race condition.

=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
--- src/qml/LiveCallPage/LiveCall.qml	2015-02-10 18:10:43 +0000
+++ src/qml/LiveCallPage/LiveCall.qml	2015-02-16 20:51:40 +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 20:51:40 +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 20:51:40 +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-02-10 17:27:52 +0000
+++ tests/autopilot/dialer_app/tests/test_calls.py	2015-02-16 20:51:40 +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 20:51:40 +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)