Merge lp:~nskaggs/ubuntu-calendar-app/assert-with-utc into lp:ubuntu-calendar-app

[Nicholas Skaggs]

Fix AP tests to use utc date/time, to match qml properties.

Fix AP tests to use utc date/time, to match qml properties.

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

FAILED: Continuous integration, rev:276
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/468/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2735
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2735/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/272
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/272/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/302
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/26

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

review: Needs Fixing (continuous-integration)

=== modified file 'tests/autopilot/calendar_app/tests/test_dayview.py'
--- tests/autopilot/calendar_app/tests/test_dayview.py	2014-02-24 15:58:49 +0000
+++ tests/autopilot/calendar_app/tests/test_dayview.py	2014-05-21 07:14:31 +0000
@@ -9,7 +9,7 @@
 Calendar app autopilot tests for the day view.
 """
 
-import datetime
+from datetime import datetime
 
 # from __future__ import range
 # (python3's range, is same as python2's xrange)
@@ -38,7 +38,7 @@
     def test_current_month_and_year_is_selected(self):
         """By default, the day view shows the current month and year."""
 
-        now = datetime.datetime.now()
+        now = datetime.utcnow()
 
         expected_year = now.year
         expected_month_name = now.strftime("%B")
@@ -59,7 +59,7 @@
         days = self.day_view.select_many(objectName="dateLabel")
         days = [int(day.text) for day in days]
 
-        now = datetime.datetime.now()
+        now = datetime.utcnow()
 
         today = now.day
         tomorrow = (now + datetime.timedelta(days=1)).day
@@ -78,7 +78,7 @@
         self.change_days(-1)
 
     def change_days(self, direction):
-        now = datetime.datetime.now()
+        now = datetime.utcnow()
 
         for i in range(1, 5):
             #prevent timing issues with swiping

=== modified file 'tests/autopilot/calendar_app/tests/test_monthview.py'
--- tests/autopilot/calendar_app/tests/test_monthview.py	2014-01-09 23:30:55 +0000
+++ tests/autopilot/calendar_app/tests/test_monthview.py	2014-05-21 07:14:31 +0000
@@ -55,7 +55,7 @@
                             Eventually(Equals(after.year)))
 
     def _assert_today(self):
-        today = datetime.today()
+        today = datetime.utcnow()
         self.assertThat(lambda: self.month_view.currentMonth.datetime.day,
                         Eventually(Equals(today.day)))
         self.assertThat(lambda: self.month_view.currentMonth.datetime.month,

=== modified file 'tests/autopilot/calendar_app/tests/test_weekview.py'
--- tests/autopilot/calendar_app/tests/test_weekview.py	2014-03-26 22:03:46 +0000
+++ tests/autopilot/calendar_app/tests/test_weekview.py	2014-05-21 07:14:31 +0000
@@ -15,8 +15,7 @@
 if sys.version_info < (3,):
     range = xrange
 
-import datetime
-
+from datetime import datetime
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals, NotEquals
 
@@ -112,7 +111,7 @@
     def test_current_month_and_year_is_selected(self):
         """By default, the week view shows the current month and year."""
 
-        now = datetime.datetime.now()
+        now = datetime.utcnow()
 
         expected_year = now.year
         expected_month_name = now.strftime("%B")
@@ -126,7 +125,7 @@
     def test_current_week_is_selected(self):
         """By default, the week view shows the current week."""
 
-        now = datetime.datetime.now()
+        now = datetime.utcnow()
         days = self._get_days_of_week()
         day_headers = self._get_date_label_headers()
 

=== modified file 'tests/autopilot/calendar_app/tests/test_yearview.py'
--- tests/autopilot/calendar_app/tests/test_yearview.py	2014-03-01 02:30:58 +0000
+++ tests/autopilot/calendar_app/tests/test_yearview.py	2014-05-21 07:14:31 +0000
@@ -115,7 +115,7 @@
                         Equals(datetime.now().year))
 
     def current_month(self):
-        now = datetime.now()
+        now = datetime.utcnow()
         current_month_name = now.strftime("%B")
 
         # for months after June, we must scroll down the page to have