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

Proposed by Thomi Richards
Status: Merged
Merged at revision: 168
Proposed branch: lp:~thomir-deactivatedaccount/ubuntu-calendar-app/trunk-fix-ap1.4-errors
Merge into: lp:ubuntu-calendar-app
Diff against target: 54 lines (+4/-7)
4 files modified
tests/autopilot/calendar_app/tests/test_dayview.py (+1/-2)
tests/autopilot/calendar_app/tests/test_monthview.py (+1/-1)
tests/autopilot/calendar_app/tests/test_weekview.py (+1/-2)
tests/autopilot/calendar_app/tests/test_yearview.py (+1/-2)
To merge this branch: bzr merge lp:~thomir-deactivatedaccount/ubuntu-calendar-app/trunk-fix-ap1.4-errors
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Needs Fixing
Ubuntu Calendar Developers Pending
Review via email: mp+194431@code.launchpad.net

Commit message

Fix errors due to the change to autopilot 1.4.

Description of the change

Fix errors due to the change to autopilot 1.4.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
7676
77 for i in xrange(1, 5):77 for i in xrange(1, 5):
78 self.main_view.swipe_view(direction, self.day_view, x_pad=0.15)78 self.main_view.swipe_view(direction, self.day_view, x_pad=0.15)
79 current_day = datetime.datetime.fromtimestamp(79 current_day = self.day_view.currentDay.datetime
80 self.day_view.currentDay)
8180
82 expected_day = (now + datetime.timedelta(81 expected_day = (now + datetime.timedelta(
83 days=(i * direction)))82 days=(i * direction)))
8483
=== 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 @@
2424
25 def get_currentDayStart(self):25 def get_currentDayStart(self):
26 month_view = self.main_view.get_month_view()26 month_view = self.main_view.get_month_view()
27 return datetime.fromtimestamp(month_view.currentMonth)27 return month_view.currentMonth.datetime
2828
29 def change_month(self, delta):29 def change_month(self, delta):
30 month_view = self.main_view.get_month_view()30 month_view = self.main_view.get_month_view()
3131
=== 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 @@
8181
82 for i in xrange(1, 5):82 for i in xrange(1, 5):
83 self.main_view.swipe_view(direction, self.week_view, x_pad=0.15)83 self.main_view.swipe_view(direction, self.week_view, x_pad=0.15)
84 day_start = datetime.datetime.fromtimestamp(84 day_start = self.week_view.dayStart.datetime
85 self.week_view.dayStart)
8685
87 expected_day_start = current_day_start + datetime.timedelta(86 expected_day_start = current_day_start + datetime.timedelta(
88 days=(i * 7 * direction))87 days=(i * 7 * direction))
8988
=== 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 @@
8383
84 for i in xrange(1, how_many):84 for i in xrange(1, how_many):
85 self.main_view.swipe_view(direction, self.year_view, x_pad=0.15)85 self.main_view.swipe_view(direction, self.year_view, x_pad=0.15)
86 selected_year = datetime.fromtimestamp(86 selected_year = self.year_view.currentYear.year
87 self.year_view.currentYear).year
8887
89 self.assertThat(88 self.assertThat(
90 selected_year, Equals(current_year + (i * direction)))89 selected_year, Equals(current_year + (i * direction)))

Subscribers

People subscribed via source and target branches

to status/vote changes: