1
=== modified file 'tests/autopilot/reminders/__init__.py'
2
--- tests/autopilot/reminders/__init__.py	2014-06-24 00:01:51 +0000
3
+++ tests/autopilot/reminders/__init__.py	2014-06-25 23:03:01 +0000
4
@@ -33,10 +33,12 @@
5
33
33
6
34
34
7
35
class RemindersAppException(Exception):
35
class RemindersAppException(Exception):
8
36
9
36
    """Exception raised when there's an error in the Reminders App."""
37
    """Exception raised when there's an error in the Reminders App."""
10
37
38
11
38
39
12
39
class RemindersApp(object):
40
class RemindersApp(object):
13
41
14
40
    """Autopilot helper object for the Reminders application."""
42
    """Autopilot helper object for the Reminders application."""
15
41
43
16
42
    def __init__(self, app_proxy):
44
    def __init__(self, app_proxy):
17
@@ -55,6 +57,7 @@
18
55
57
19
56
58
20
57
class MainView(toolkit_emulators.MainView):
59
class MainView(toolkit_emulators.MainView):
21
60
22
58
    """Autopilot custom proxy object for the MainView."""
61
    """Autopilot custom proxy object for the MainView."""
23
59
62
24
60
    def __init__(self, *args):
63
    def __init__(self, *args):
25
@@ -76,6 +79,7 @@
26
76
79
27
77
80
28
78
class NoAccountDialog(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
81
class NoAccountDialog(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
29
82
30
79
    """Autopilot custom proxy object for the no account dialog."""
83
    """Autopilot custom proxy object for the no account dialog."""
31
80
84
32
81
    @classmethod
85
    @classmethod
33
@@ -110,10 +114,12 @@
34
110
114
35
111
115
36
112
class PulldownListView(ubuntuuitoolkit.QQuickListView):
116
class PulldownListView(ubuntuuitoolkit.QQuickListView):
37
117
38
113
    """Autopilot custom proxy object for the PulldownListView."""
118
    """Autopilot custom proxy object for the PulldownListView."""
39
114
119
40
115
120
41
116
class NotebooksPage(_Page):
121
class NotebooksPage(_Page):
42
122
43
117
    """Autopilot custom proxy object for the Notebooks page."""
123
    """Autopilot custom proxy object for the Notebooks page."""
44
118
124
45
119
    def add_notebook(self, title):
125
    def add_notebook(self, title):
46
@@ -164,6 +170,7 @@
47
164
170
48
165
171
49
166
class NotebooksDelegate(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
172
class NotebooksDelegate(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
50
173
51
167
    """Autopilot custom proxy object for the NotebooksDelegate."""
174
    """Autopilot custom proxy object for the NotebooksDelegate."""
52
168
175
53
169
    def get_title(self):
176
    def get_title(self):
54
170
177
55
=== modified file 'tests/autopilot/reminders/credentials.py'
56
--- tests/autopilot/reminders/credentials.py	2014-05-14 16:18:22 +0000
57
+++ tests/autopilot/reminders/credentials.py	2014-06-25 23:03:01 +0000
58
@@ -21,10 +21,12 @@
59
21
21
60
22
22
61
23
class CredentialsException(Exception):
23
class CredentialsException(Exception):
62
24
63
24
    """Exception for credentials problems."""
25
    """Exception for credentials problems."""
64
25
26
65
26
27
66
27
class AccountManager(object):
28
class AccountManager(object):
67
29
68
28
    """Manager for online accounts."""
30
    """Manager for online accounts."""
69
29
31
70
30
    def __init__(self):
32
    def __init__(self):
71
31
33
72
=== modified file 'tests/autopilot/reminders/evernote.py'
73
--- tests/autopilot/reminders/evernote.py	2014-05-15 07:02:41 +0000
74
+++ tests/autopilot/reminders/evernote.py	2014-06-25 23:03:01 +0000
75
@@ -30,6 +30,7 @@
76
30
30
77
31
31
78
32
class SandboxEvernoteClient(client.EvernoteClient):
32
class SandboxEvernoteClient(client.EvernoteClient):
79
33
80
33
    """Client to access the Evernote API on the sandbox server."""
34
    """Client to access the Evernote API on the sandbox server."""
81
34
35
82
35
    def __init__(self):
36
    def __init__(self):
83
36
37
84
=== modified file 'tests/autopilot/reminders/fake_services.py'
85
--- tests/autopilot/reminders/fake_services.py	2014-04-24 19:26:51 +0000
86
+++ tests/autopilot/reminders/fake_services.py	2014-06-25 23:03:01 +0000
87
@@ -25,6 +25,7 @@
88
25
25
89
26
26
90
27
class FakeURLDispatcherService(object):
27
class FakeURLDispatcherService(object):
91
28
92
28
    """Fake URL Dispatcher service using a dbusmock interface."""
29
    """Fake URL Dispatcher service using a dbusmock interface."""
93
29
30
94
30
    def __init__(self):
31
    def __init__(self):
95
31
32
96
=== modified file 'tests/autopilot/reminders/tests/__init__.py'
97
--- tests/autopilot/reminders/tests/__init__.py	2014-05-23 07:11:23 +0000
98
+++ tests/autopilot/reminders/tests/__init__.py	2014-06-25 23:03:01 +0000
99
@@ -36,6 +36,7 @@
100
36
36
101
37
37
102
38
class RemindersAppTestCase(AutopilotTestCase):
38
class RemindersAppTestCase(AutopilotTestCase):
103
39
104
39
    """A common test case class that provides several useful methods for
40
    """A common test case class that provides several useful methods for
105
40
       reminders-app tests."""
41
       reminders-app tests."""
106
41
42
107
@@ -90,14 +91,14 @@
108
90
        temp_dir = temp_dir_fixture.path
91
        temp_dir = temp_dir_fixture.path
109
91
        temp_xdg_config_home = os.path.join(temp_dir, '.config')
92
        temp_xdg_config_home = os.path.join(temp_dir, '.config')
110
92
93
115
93
        #If running under xvfb, as jenkins does,
94
        # If running under xvfb, as jenkins does,
116
94
        #xsession will fail to start without xauthority file
95
        # xsession will fail to start without xauthority file
117
95
        #Thus if the Xauthority file is in the home directory
96
        # Thus if the Xauthority file is in the home directory
118
96
        #make sure we copy it to our temp home directory
97
        # make sure we copy it to our temp home directory
119
97
        self._copy_xauthority_file(temp_dir)
98
        self._copy_xauthority_file(temp_dir)
120
98
99
123
99
        #click requires using initctl env (upstart), but the desktop can set
100
        # click requires using initctl env (upstart), but the desktop can set
124
100
        #an environment variable instead
101
        # an environment variable instead
125
101
        if test_type == 'click':
102
        if test_type == 'click':
126
102
            self.useFixture(
103
            self.useFixture(
127
103
                toolkit_fixtures.InitctlEnvironmentVariable(
104
                toolkit_fixtures.InitctlEnvironmentVariable(
128
104
105
129
=== modified file 'tests/autopilot/reminders/tests/test_evernote.py'
130
--- tests/autopilot/reminders/tests/test_evernote.py	2014-05-15 07:02:41 +0000
131
+++ tests/autopilot/reminders/tests/test_evernote.py	2014-06-25 23:03:01 +0000
132
@@ -24,6 +24,7 @@
133
24
24
134
25
25
135
26
class EvernoteTestCase(testtools.TestCase):
26
class EvernoteTestCase(testtools.TestCase):
136
27
137
27
    """Test the evernote access with the SDK."""
28
    """Test the evernote access with the SDK."""
138
28
29
139
29
    def setUp(self):
30
    def setUp(self):
140
30
31
141
=== modified file 'tests/autopilot/reminders/tests/test_reminders.py'
142
--- tests/autopilot/reminders/tests/test_reminders.py	2014-05-15 07:02:41 +0000
143
+++ tests/autopilot/reminders/tests/test_reminders.py	2014-06-25 23:03:01 +0000
144
@@ -96,7 +96,7 @@
145
96
        # TODO there's a bug with the last updated value: http://pad.lv/1318751
96
        # TODO there's a bug with the last updated value: http://pad.lv/1318751
146
97
        # so we can't check the full tuple. Uncomment this as soon as the bug
97
        # so we can't check the full tuple. Uncomment this as soon as the bug
147
98
        # is fixed. --elopio - 2014-05-12
98
        # is fixed. --elopio - 2014-05-12
149
99
        #self.assertEqual(
99
        # self.assertEqual(
150
100
        #    last_notebook,
100
        #    last_notebook,
151
101
        #    (test_notebook_title, 'Last edited today', 'Private', 0))
101
        #    (test_notebook_title, 'Last edited today', 'Private', 0))
152
102
        self.assertEqual(last_notebook[0], test_notebook_title)
102
        self.assertEqual(last_notebook[0], test_notebook_title)
Status:	Merged
Approved by:	Nicholas Skaggs on 2014-06-26
Approved revision:	166
Merged at revision:	166
Proposed branch:	lp:~nskaggs/reminders-app/fix-new-pep8
Merge into:	lp:reminders-app
Diff against target:	152 lines (+20/-7) 7 files modified tests/autopilot/reminders/__init__.py (+7/-0) tests/autopilot/reminders/credentials.py (+2/-0) tests/autopilot/reminders/evernote.py (+1/-0) tests/autopilot/reminders/fake_services.py (+1/-0) tests/autopilot/reminders/tests/__init__.py (+7/-6) tests/autopilot/reminders/tests/test_evernote.py (+1/-0) tests/autopilot/reminders/tests/test_reminders.py (+1/-1)
To merge this branch:	bzr merge lp:~nskaggs/reminders-app/fix-new-pep8
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2014-06-26
Leo Arias (community)			Approve on 2014-06-25
Ubuntu Notes app developers		2014-06-25	Pending
Review via email: mp+224536@code.launchpad.net
1	=== modified file 'tests/autopilot/reminders/__init__.py'
2	--- tests/autopilot/reminders/__init__.py 2014-06-24 00:01:51 +0000
3	+++ tests/autopilot/reminders/__init__.py 2014-06-25 23:03:01 +0000
4	@@ -33,10 +33,12 @@
5	33		33
6	34		34
7	35	class RemindersAppException(Exception):	35	class RemindersAppException(Exception):
8			36
9	36	"""Exception raised when there's an error in the Reminders App."""	37	"""Exception raised when there's an error in the Reminders App."""
10	37		38
11	38		39
12	39	class RemindersApp(object):	40	class RemindersApp(object):
13			41
14	40	"""Autopilot helper object for the Reminders application."""	42	"""Autopilot helper object for the Reminders application."""
15	41		43
16	42	def __init__(self, app_proxy):	44	def __init__(self, app_proxy):
17	@@ -55,6 +57,7 @@
18	55		57
19	56		58
20	57	class MainView(toolkit_emulators.MainView):	59	class MainView(toolkit_emulators.MainView):
21			60
22	58	"""Autopilot custom proxy object for the MainView."""	61	"""Autopilot custom proxy object for the MainView."""
23	59		62
24	60	def __init__(self, *args):	63	def __init__(self, *args):
25	@@ -76,6 +79,7 @@
26	76		79
27	77		80
28	78	class NoAccountDialog(toolkit_emulators.UbuntuUIToolkitEmulatorBase):	81	class NoAccountDialog(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
29			82
30	79	"""Autopilot custom proxy object for the no account dialog."""	83	"""Autopilot custom proxy object for the no account dialog."""
31	80		84
32	81	@classmethod	85	@classmethod
33	@@ -110,10 +114,12 @@
34	110		114
35	111		115
36	112	class PulldownListView(ubuntuuitoolkit.QQuickListView):	116	class PulldownListView(ubuntuuitoolkit.QQuickListView):
37			117
38	113	"""Autopilot custom proxy object for the PulldownListView."""	118	"""Autopilot custom proxy object for the PulldownListView."""
39	114		119
40	115		120
41	116	class NotebooksPage(_Page):	121	class NotebooksPage(_Page):
42			122
43	117	"""Autopilot custom proxy object for the Notebooks page."""	123	"""Autopilot custom proxy object for the Notebooks page."""
44	118		124
45	119	def add_notebook(self, title):	125	def add_notebook(self, title):
46	@@ -164,6 +170,7 @@
47	164		170
48	165		171
49	166	class NotebooksDelegate(toolkit_emulators.UbuntuUIToolkitEmulatorBase):	172	class NotebooksDelegate(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
50			173
51	167	"""Autopilot custom proxy object for the NotebooksDelegate."""	174	"""Autopilot custom proxy object for the NotebooksDelegate."""
52	168		175
53	169	def get_title(self):	176	def get_title(self):
54	170		177
55	=== modified file 'tests/autopilot/reminders/credentials.py'
56	--- tests/autopilot/reminders/credentials.py 2014-05-14 16:18:22 +0000
57	+++ tests/autopilot/reminders/credentials.py 2014-06-25 23:03:01 +0000
58	@@ -21,10 +21,12 @@
59	21		21
60	22		22
61	23	class CredentialsException(Exception):	23	class CredentialsException(Exception):
62			24
63	24	"""Exception for credentials problems."""	25	"""Exception for credentials problems."""
64	25		26
65	26		27
66	27	class AccountManager(object):	28	class AccountManager(object):
67			29
68	28	"""Manager for online accounts."""	30	"""Manager for online accounts."""
69	29		31
70	30	def __init__(self):	32	def __init__(self):
71	31		33
72	=== modified file 'tests/autopilot/reminders/evernote.py'
73	--- tests/autopilot/reminders/evernote.py 2014-05-15 07:02:41 +0000
74	+++ tests/autopilot/reminders/evernote.py 2014-06-25 23:03:01 +0000
75	@@ -30,6 +30,7 @@
76	30		30
77	31		31
78	32	class SandboxEvernoteClient(client.EvernoteClient):	32	class SandboxEvernoteClient(client.EvernoteClient):
79			33
80	33	"""Client to access the Evernote API on the sandbox server."""	34	"""Client to access the Evernote API on the sandbox server."""
81	34		35
82	35	def __init__(self):	36	def __init__(self):
83	36		37
84	=== modified file 'tests/autopilot/reminders/fake_services.py'
85	--- tests/autopilot/reminders/fake_services.py 2014-04-24 19:26:51 +0000
86	+++ tests/autopilot/reminders/fake_services.py 2014-06-25 23:03:01 +0000
87	@@ -25,6 +25,7 @@
88	25		25
89	26		26
90	27	class FakeURLDispatcherService(object):	27	class FakeURLDispatcherService(object):
91			28
92	28	"""Fake URL Dispatcher service using a dbusmock interface."""	29	"""Fake URL Dispatcher service using a dbusmock interface."""
93	29		30
94	30	def __init__(self):	31	def __init__(self):
95	31		32
96	=== modified file 'tests/autopilot/reminders/tests/__init__.py'
97	--- tests/autopilot/reminders/tests/__init__.py 2014-05-23 07:11:23 +0000
98	+++ tests/autopilot/reminders/tests/__init__.py 2014-06-25 23:03:01 +0000
99	@@ -36,6 +36,7 @@
100	36		36
101	37		37
102	38	class RemindersAppTestCase(AutopilotTestCase):	38	class RemindersAppTestCase(AutopilotTestCase):
103			39
104	39	"""A common test case class that provides several useful methods for	40	"""A common test case class that provides several useful methods for
105	40	reminders-app tests."""	41	reminders-app tests."""
106	41		42
107	@@ -90,14 +91,14 @@
108	90	temp_dir = temp_dir_fixture.path	91	temp_dir = temp_dir_fixture.path
109	91	temp_xdg_config_home = os.path.join(temp_dir, '.config')	92	temp_xdg_config_home = os.path.join(temp_dir, '.config')
110	92		93
115	93	#If running under xvfb, as jenkins does,	94	# If running under xvfb, as jenkins does,
116	94	#xsession will fail to start without xauthority file	95	# xsession will fail to start without xauthority file
117	95	#Thus if the Xauthority file is in the home directory	96	# Thus if the Xauthority file is in the home directory
118	96	#make sure we copy it to our temp home directory	97	# make sure we copy it to our temp home directory
119	97	self._copy_xauthority_file(temp_dir)	98	self._copy_xauthority_file(temp_dir)
120	98		99
123	99	#click requires using initctl env (upstart), but the desktop can set	100	# click requires using initctl env (upstart), but the desktop can set
124	100	#an environment variable instead	101	# an environment variable instead
125	101	if test_type == 'click':	102	if test_type == 'click':
126	102	self.useFixture(	103	self.useFixture(
127	103	toolkit_fixtures.InitctlEnvironmentVariable(	104	toolkit_fixtures.InitctlEnvironmentVariable(
128	104		105
129	=== modified file 'tests/autopilot/reminders/tests/test_evernote.py'
130	--- tests/autopilot/reminders/tests/test_evernote.py 2014-05-15 07:02:41 +0000
131	+++ tests/autopilot/reminders/tests/test_evernote.py 2014-06-25 23:03:01 +0000
132	@@ -24,6 +24,7 @@
133	24		24
134	25		25
135	26	class EvernoteTestCase(testtools.TestCase):	26	class EvernoteTestCase(testtools.TestCase):
136			27
137	27	"""Test the evernote access with the SDK."""	28	"""Test the evernote access with the SDK."""
138	28		29
139	29	def setUp(self):	30	def setUp(self):
140	30		31
141	=== modified file 'tests/autopilot/reminders/tests/test_reminders.py'
142	--- tests/autopilot/reminders/tests/test_reminders.py 2014-05-15 07:02:41 +0000
143	+++ tests/autopilot/reminders/tests/test_reminders.py 2014-06-25 23:03:01 +0000
144	@@ -96,7 +96,7 @@
145	96	# TODO there's a bug with the last updated value: http://pad.lv/1318751	96	# TODO there's a bug with the last updated value: http://pad.lv/1318751
146	97	# so we can't check the full tuple. Uncomment this as soon as the bug	97	# so we can't check the full tuple. Uncomment this as soon as the bug
147	98	# is fixed. --elopio - 2014-05-12	98	# is fixed. --elopio - 2014-05-12
149	99	#self.assertEqual(	99	# self.assertEqual(
150	100	# last_notebook,	100	# last_notebook,
151	101	# (test_notebook_title, 'Last edited today', 'Private', 0))	101	# (test_notebook_title, 'Last edited today', 'Private', 0))
152	102	self.assertEqual(last_notebook[0], test_notebook_title)	102	self.assertEqual(last_notebook[0], test_notebook_title)