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

[Nicholas Skaggs]

Switch tests to prod

This switches the tests to use evernote servers, instead of evernote sandbox servers. This fixes https://bugs.launchpad.net/reminders-app/+bug/1347905.

Note, we should run against prod, as the app runs against prod now. We should consider a master testing plan of what to test against the sandbox vs prod, if anything.

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

FAILED: Continuous integration, rev:206
http://91.189.93.70:8080/job/reminders-app-ci/471/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1196/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/167/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/471/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/reminders-app/bug-1347905]

207. By Nicholas Skaggs on 2014-07-30

fix flake8

[Nicholas Skaggs (nskaggs)]

Leo reminds me this would encounter an oauth issue on the device.

review: Needs Fixing

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

PASSED: Continuous integration, rev:207
http://91.189.93.70:8080/job/reminders-app-ci/472/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1201
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1201/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/168

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/472/rebuild

review: Approve (continuous-integration)

Unmerged revisions

207. By Nicholas Skaggs on 2014-07-30

fix flake8

206. By Nicholas Skaggs on 2014-07-29

remove skiptests for the bug

205. By Nicholas Skaggs on 2014-07-29

revert url dispatcher commits

204. By Nicholas Skaggs on 2014-07-29

switch from sandbox to prod servers

=== modified file 'tests/autopilot/reminders/credentials.py'
--- tests/autopilot/reminders/credentials.py	2014-07-24 21:36:02 +0000
+++ tests/autopilot/reminders/credentials.py	2014-07-30 02:45:35 +0000
@@ -81,7 +81,7 @@
 
     def _create_account(self):
         logger.debug('Creating the Evernote account.')
-        account = self._manager.create_account('evernote-sandbox')
+        account = self._manager.create_account('evernote')
         account.set_enabled(True)
         account.store(self._on_account_created, None)
         return account
@@ -143,7 +143,7 @@
 
     def _enable_evernote_service(self, account):
         logger.debug('Enabling evernote service.')
-        service = self._manager.get_service('evernote-sandbox')
+        service = self._manager.get_service('evernote')
         account.select_service(service)
         account.set_enabled(True)
         account.store(self._on_service_enabled, None)

=== modified file 'tests/autopilot/reminders/tests/__init__.py'
--- tests/autopilot/reminders/tests/__init__.py	2014-07-25 16:43:59 +0000
+++ tests/autopilot/reminders/tests/__init__.py	2014-07-30 02:45:35 +0000
@@ -101,7 +101,6 @@
         return self.launch_click_package(
             'com.ubuntu.reminders',
             'reminders',
-            '-s',
             emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
 
     def _patch_home(self, test_type):

=== modified file 'tests/autopilot/reminders/tests/test_credentials.py'
--- tests/autopilot/reminders/tests/test_credentials.py	2014-07-24 21:30:46 +0000
+++ tests/autopilot/reminders/tests/test_credentials.py	2014-07-30 02:45:35 +0000
@@ -18,7 +18,6 @@
 
 from gi.repository import Accounts
 from testtools.matchers import HasLength
-from autopilot import platform
 
 from reminders import credentials, evernote, tests
 
@@ -29,9 +28,6 @@
 class EvernoteCredentialsTestCase(tests.BaseTestCaseWithTempHome):
 
     def setUp(self):
-        # bug https://bugs.launchpad.net/reminders-app/+bug/1347905
-        if platform.model() != 'Desktop':
-            self.skipTest("Fake Account failure bug 1347905")
         super(EvernoteCredentialsTestCase, self).setUp()
         self.account_manager = credentials.AccountManager()
 
@@ -55,14 +51,14 @@
     def test_add_evernote_account_must_set_provider(self):
         account = self.add_evernote_account()
 
-        self.assertEqual(account.get_provider_name(), 'evernote-sandbox')
+        self.assertEqual(account.get_provider_name(), 'evernote')
 
     def test_add_evernote_account_must_enable_evernote_service(self):
         account = self.add_evernote_account()
         services = account.list_services()
 
         self.assertThat(services, HasLength(1))
-        self.assertEqual(services[0].get_name(), 'evernote-sandbox')
+        self.assertEqual(services[0].get_name(), 'evernote')
         service = Accounts.AccountService.new(account, services[0])
         self.assertTrue(service.get_enabled())
 

=== modified file 'tests/autopilot/reminders/tests/test_reminders.py'
--- tests/autopilot/reminders/tests/test_reminders.py	2014-07-25 17:27:49 +0000
+++ tests/autopilot/reminders/tests/test_reminders.py	2014-07-30 02:45:35 +0000
@@ -64,9 +64,6 @@
 class RemindersTestCaseWithAccount(tests.RemindersAppTestCase):
 
     def setUp(self):
-        # bug https://bugs.launchpad.net/reminders-app/+bug/1347905
-        if platform.model() != 'Desktop':
-            self.skipTest("Fake Account failure bug 1347905")
         super(RemindersTestCaseWithAccount, self).setUp()
         no_account_dialog = self.app.main_view.no_account_dialog
         self.add_evernote_account()