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
=== modified file 'tests/autopilot/reminders/credentials.py'
--- tests/autopilot/reminders/credentials.py 2014-10-16 02:10:56 +0000
+++ tests/autopilot/reminders/credentials.py 2016-02-23 17:12:10 +0000
@@ -18,6 +18,9 @@
18import time18import time
19import threading19import threading
2020
21import gi
22gi.require_version('Accounts', '1.0')
23gi.require_version('Signon', '1.0')
21from gi.repository import Accounts, GLib, Signon24from gi.repository import Accounts, GLib, Signon
2225
2326
2427
=== modified file 'tests/autopilot/reminders/tests/__init__.py'
--- tests/autopilot/reminders/tests/__init__.py 2014-11-13 10:30:34 +0000
+++ tests/autopilot/reminders/tests/__init__.py 2016-02-23 17:12:10 +0000
@@ -23,9 +23,11 @@
23import subprocess23import subprocess
2424
25import fixtures25import fixtures
26import gi
26import ubuntuuitoolkit27import ubuntuuitoolkit
27from autopilot import logging as autopilot_logging28from autopilot import logging as autopilot_logging
28from autopilot.testcase import AutopilotTestCase29from autopilot.testcase import AutopilotTestCase
30gi.require_version('Click', '0.4')
29from gi.repository import Click31from gi.repository import Click
3032
31import reminders33import reminders
3234
=== modified file 'tests/autopilot/reminders/tests/test_credentials.py'
--- tests/autopilot/reminders/tests/test_credentials.py 2014-10-01 12:10:43 +0000
+++ tests/autopilot/reminders/tests/test_credentials.py 2016-02-23 17:12:10 +0000
@@ -16,6 +16,8 @@
1616
17import logging17import logging
1818
19import gi
20gi.require_version('Accounts', '1.0')
19from gi.repository import Accounts21from gi.repository import Accounts
20from testtools.matchers import HasLength22from testtools.matchers import HasLength
2123

Subscribers

People subscribed via source and target branches