Merge lp:~canonical-platform-qa/reminders-app/lp1546782 into lp:reminders-app

Proposed by Max Brustkern
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 537
Merged at revision: 538
Proposed branch: lp:~canonical-platform-qa/reminders-app/lp1546782
Merge into: lp:reminders-app
Diff against target: 41 lines (+7/-0)
3 files modified
tests/autopilot/reminders/credentials.py (+3/-0)
tests/autopilot/reminders/tests/__init__.py (+2/-0)
tests/autopilot/reminders/tests/test_credentials.py (+2/-0)
To merge this branch: bzr merge lp:~canonical-platform-qa/reminders-app/lp1546782
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Review via email: mp+286926@code.launchpad.net

Commit message

This branch updates the test code to import specific gi versions, fixing lp#1546782.

Description of the change

This branch updates the test code to import specific gi versions, fixing lp#1546782.

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~canonical-platform-qa/reminders-app/lp1546782/+merge/286926/+edit-commit-message

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Thanks Max!

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)
Revision history for this message
Max Brustkern (nuclearbob) wrote :

You're welcome! Thanks for fixing the lack of a commit message!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/reminders/credentials.py'
2--- tests/autopilot/reminders/credentials.py 2014-10-16 02:10:56 +0000
3+++ tests/autopilot/reminders/credentials.py 2016-02-23 17:12:10 +0000
4@@ -18,6 +18,9 @@
5 import time
6 import threading
7
8+import gi
9+gi.require_version('Accounts', '1.0')
10+gi.require_version('Signon', '1.0')
11 from gi.repository import Accounts, GLib, Signon
12
13
14
15=== modified file 'tests/autopilot/reminders/tests/__init__.py'
16--- tests/autopilot/reminders/tests/__init__.py 2014-11-13 10:30:34 +0000
17+++ tests/autopilot/reminders/tests/__init__.py 2016-02-23 17:12:10 +0000
18@@ -23,9 +23,11 @@
19 import subprocess
20
21 import fixtures
22+import gi
23 import ubuntuuitoolkit
24 from autopilot import logging as autopilot_logging
25 from autopilot.testcase import AutopilotTestCase
26+gi.require_version('Click', '0.4')
27 from gi.repository import Click
28
29 import reminders
30
31=== modified file 'tests/autopilot/reminders/tests/test_credentials.py'
32--- tests/autopilot/reminders/tests/test_credentials.py 2014-10-01 12:10:43 +0000
33+++ tests/autopilot/reminders/tests/test_credentials.py 2016-02-23 17:12:10 +0000
34@@ -16,6 +16,8 @@
35
36 import logging
37
38+import gi
39+gi.require_version('Accounts', '1.0')
40 from gi.repository import Accounts
41 from testtools.matchers import HasLength
42

Subscribers

People subscribed via source and target branches