Merge lp:~nskaggs/reminders-app/fix-1347905 into lp:reminders-app

Proposed by Nicholas Skaggs
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 206
Merged at revision: 212
Proposed branch: lp:~nskaggs/reminders-app/fix-1347905
Merge into: lp:reminders-app
Diff against target: 59 lines (+2/-8)
4 files modified
debian/control (+1/-0)
manifest.json (+1/-1)
tests/autopilot/reminders/tests/test_credentials.py (+0/-4)
tests/autopilot/reminders/tests/test_reminders.py (+0/-3)
To merge this branch: bzr merge lp:~nskaggs/reminders-app/fix-1347905
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Omer Akram (community) code Approve
Ubuntu Notes app developers Pending
Review via email: mp+228917@code.launchpad.net

Commit message

Re-enable tests for running on device

Description of the change

Add account-plugin-evernote-sandbox as depends for autopilot tests, re-enable testcases

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: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Omer Akram (om26er) wrote :

tests are failing on my desktop, though I guess not really related to this branch ?

http://paste.ubuntu.com/7952459/

Revision history for this message
David Planella (dpm) wrote :

Omer, the tests failing might be related to bug 1351041

On Mon, Aug 4, 2014 at 4:48 PM, Omer Akram <email address hidden> wrote:

> tests are failing on my desktop, though I guess not really related to this
> branch ?
>
> http://paste.ubuntu.com/7952459/
> --
> https://code.launchpad.net/~nskaggs/reminders-app/fix-1347905/+merge/228917
> Your team Ubuntu Reminders app developers is requested to review the
> proposed merge of lp:~nskaggs/reminders-app/fix-1347905 into
> lp:reminders-app.
>

Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Wow, what timing. Thanks for the link and heads up David.

Revision history for this message
Omer Akram (om26er) wrote :

change looks good.

review: Approve (code)
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
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-07-03 18:40:37 +0000
3+++ debian/control 2014-07-30 21:30:35 +0000
4@@ -72,5 +72,6 @@
5 python3-oauthlib,
6 python3-requests-oauthlib,
7 ubuntu-ui-toolkit-autopilot,
8+ account-plugin-evernote-sandbox
9 Description: Test package for the Reminders app
10 Autopilot tests for the Reminders app package
11
12=== modified file 'manifest.json'
13--- manifest.json 2014-07-24 06:54:22 +0000
14+++ manifest.json 2014-07-30 21:30:35 +0000
15@@ -20,7 +20,7 @@
16 "x-test": {
17 "autopilot": {
18 "autopilot_module": "@AUTOPILOT_DIR@",
19- "depends": ["python3-dbus", "python3-dbusmock", "python3-fixtures", "python3-oauthlib", "python3-requests-oauthlib"]
20+ "depends": ["python3-dbus", "python3-dbusmock", "python3-fixtures", "python3-oauthlib", "python3-requests-oauthlib", "account-plugin-evernote-sandbox"]
21 }
22 }
23 }
24
25=== modified file 'tests/autopilot/reminders/tests/test_credentials.py'
26--- tests/autopilot/reminders/tests/test_credentials.py 2014-07-24 21:30:46 +0000
27+++ tests/autopilot/reminders/tests/test_credentials.py 2014-07-30 21:30:35 +0000
28@@ -18,7 +18,6 @@
29
30 from gi.repository import Accounts
31 from testtools.matchers import HasLength
32-from autopilot import platform
33
34 from reminders import credentials, evernote, tests
35
36@@ -29,9 +28,6 @@
37 class EvernoteCredentialsTestCase(tests.BaseTestCaseWithTempHome):
38
39 def setUp(self):
40- # bug https://bugs.launchpad.net/reminders-app/+bug/1347905
41- if platform.model() != 'Desktop':
42- self.skipTest("Fake Account failure bug 1347905")
43 super(EvernoteCredentialsTestCase, self).setUp()
44 self.account_manager = credentials.AccountManager()
45
46
47=== modified file 'tests/autopilot/reminders/tests/test_reminders.py'
48--- tests/autopilot/reminders/tests/test_reminders.py 2014-07-25 17:27:49 +0000
49+++ tests/autopilot/reminders/tests/test_reminders.py 2014-07-30 21:30:35 +0000
50@@ -64,9 +64,6 @@
51 class RemindersTestCaseWithAccount(tests.RemindersAppTestCase):
52
53 def setUp(self):
54- # bug https://bugs.launchpad.net/reminders-app/+bug/1347905
55- if platform.model() != 'Desktop':
56- self.skipTest("Fake Account failure bug 1347905")
57 super(RemindersTestCaseWithAccount, self).setUp()
58 no_account_dialog = self.app.main_view.no_account_dialog
59 self.add_evernote_account()

Subscribers

People subscribed via source and target branches