Merge lp:~thomir-deactivatedaccount/ubuntu-calendar-app/trunk-fix-ap1.4-errors into lp:ubuntu-calendar-app

[Thomi Richards]

Fix errors due to the change to autopilot 1.4.

Fix errors due to the change to autopilot 1.4.

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

FAILED: Continuous integration, rev:166
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/191/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/103
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/191
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/191
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/25

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/191/rebuild

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

I think this should be combined with https://code.launchpad.net/~elopio/ubuntu-calendar-app/autopilot-1.4/+merge/192631 which lacks the test_dayview.py change but has other updates.

=== modified file 'tests/autopilot/calendar_app/tests/test_dayview.py'
--- tests/autopilot/calendar_app/tests/test_dayview.py	2013-10-29 20:55:31 +0000
+++ tests/autopilot/calendar_app/tests/test_dayview.py	2013-11-08 01:43:36 +0000
@@ -76,8 +76,7 @@
 
         for i in xrange(1, 5):
             self.main_view.swipe_view(direction, self.day_view, x_pad=0.15)
-            current_day = datetime.datetime.fromtimestamp(
-                self.day_view.currentDay)
+            current_day = self.day_view.currentDay.datetime
 
             expected_day = (now + datetime.timedelta(
                 days=(i * direction)))

=== modified file 'tests/autopilot/calendar_app/tests/test_monthview.py'
--- tests/autopilot/calendar_app/tests/test_monthview.py	2013-10-13 12:34:08 +0000
+++ tests/autopilot/calendar_app/tests/test_monthview.py	2013-11-08 01:43:36 +0000
@@ -24,7 +24,7 @@
 
     def get_currentDayStart(self):
         month_view = self.main_view.get_month_view()
-        return datetime.fromtimestamp(month_view.currentMonth)
+        return month_view.currentMonth.datetime
 
     def change_month(self, delta):
         month_view = self.main_view.get_month_view()

=== modified file 'tests/autopilot/calendar_app/tests/test_weekview.py'
--- tests/autopilot/calendar_app/tests/test_weekview.py	2013-10-28 21:08:48 +0000
+++ tests/autopilot/calendar_app/tests/test_weekview.py	2013-11-08 01:43:36 +0000
@@ -81,8 +81,7 @@
 
         for i in xrange(1, 5):
             self.main_view.swipe_view(direction, self.week_view, x_pad=0.15)
-            day_start = datetime.datetime.fromtimestamp(
-                self.week_view.dayStart)
+            day_start = self.week_view.dayStart.datetime
 
             expected_day_start = current_day_start + datetime.timedelta(
                 days=(i * 7 * direction))

=== modified file 'tests/autopilot/calendar_app/tests/test_yearview.py'
--- tests/autopilot/calendar_app/tests/test_yearview.py	2013-10-28 21:08:48 +0000
+++ tests/autopilot/calendar_app/tests/test_yearview.py	2013-11-08 01:43:36 +0000
@@ -83,8 +83,7 @@
 
         for i in xrange(1, how_many):
             self.main_view.swipe_view(direction, self.year_view, x_pad=0.15)
-            selected_year = datetime.fromtimestamp(
-                self.year_view.currentYear).year
+            selected_year = self.year_view.currentYear.year
 
             self.assertThat(
                 selected_year, Equals(current_year + (i * direction)))