Merge lp:~osomon/ubuntu-calendar-app/assert-today-is-today into lp:ubuntu-calendar-app

[Olivier Tilloy]

Ensure that the current date is today before starting the tests.
This should fix a race condition whereby the current date was not initialized yet when the test was starting, resulting in broken assumptions.

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

PASSED: Continuous integration, rev:116
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/73/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/398
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/73
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/73
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/73
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/73

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Now I remember the issue with the original test Olivier :-) It hangs forever on the device. At least on my nexus 4, running the latest stable image.

review: Needs Fixing

[Nicholas Skaggs (nskaggs)]

Ok, I take that back it eventually works, but it took a LONG time:

Ran 5 tests in 787.729s
OK

review: Approve

[Olivier Tilloy (osomon)]

> Ok, I take that back it eventually works, but it took a LONG time:
>
> Ran 5 tests in 787.729s
> OK

Wow. 13 minutes to run 5 tests, that’s unexpected. Have you observed the tests while running, and do you know what is taking so long?

[Nicholas Skaggs (nskaggs)]

Yes, I observed them while running. The device hung for a long long time, then finished the tests normally. My guess is it's a dbus issue.

=== modified file 'tests/autopilot/calendar_app/tests/test_monthview.py'
--- tests/autopilot/calendar_app/tests/test_monthview.py	2013-09-16 10:28:33 +0000
+++ tests/autopilot/calendar_app/tests/test_monthview.py	2013-09-17 17:12:02 +0000
@@ -44,16 +44,20 @@
             self.assertThat(lambda: self.get_currentDayStart().year,
                             Eventually(Equals(after.year)))
 
+    def _assert_today(self):
+        today = datetime.today()
+        self.assertThat(lambda: self.get_currentDayStart().day,
+                        Eventually(Equals(today.day)))
+        self.assertThat(lambda: self.get_currentDayStart().month,
+                        Eventually(Equals(today.month)))
+        self.assertThat(lambda: self.get_currentDayStart().year,
+                        Eventually(Equals(today.year)))
+
     def _test_go_to_today(self, delta):
-        start = self.get_currentDayStart()
+        self._assert_today()
         self.change_month(delta)
         self.main_view.open_toolbar().click_button("todaybutton")
-        self.assertThat(lambda: self.get_currentDayStart().day,
-                        Eventually(Equals(start.day)))
-        self.assertThat(lambda: self.get_currentDayStart().month,
-                        Eventually(Equals(start.month)))
-        self.assertThat(lambda: self.get_currentDayStart().year,
-                        Eventually(Equals(start.year)))
+        self._assert_today()
 
     def test_monthview_go_to_today_next_month(self):
         self._test_go_to_today(1)