Merge lp:~mardy/click-reviewers-tools/no-service-type-check into lp:click-reviewers-tools

Proposed by Alberto Mardegan
Status: Merged
Merged at revision: 505
Proposed branch: lp:~mardy/click-reviewers-tools/no-service-type-check
Merge into: lp:click-reviewers-tools
Diff against target: 34 lines (+3/-3)
2 files modified
clickreviews/cr_online_accounts.py (+1/-1)
clickreviews/tests/test_cr_online_accounts.py (+2/-2)
To merge this branch: bzr merge lp:~mardy/click-reviewers-tools/no-service-type-check
Reviewer Review Type Date Requested Status
Jamie Strandboge (community) Approve
Review via email: mp+265481@code.launchpad.net

Commit message

Do not check for "type" element in OA .service files

Description of the change

Do not check for "type" element in OA .service files

To post a comment you must log in.
506. By Alberto Mardegan

Update tests

Revision history for this message
Jamie Strandboge (jdstrand) wrote :

Thanks for the MP :) I think this looks fine but if we aren't going to check for type there is no reason stubbing it out or having a test case for it in the testsuite. I'll commit those changes on top of yours.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'clickreviews/cr_online_accounts.py'
--- clickreviews/cr_online_accounts.py 2015-07-14 21:27:25 +0000
+++ clickreviews/cr_online_accounts.py 2015-07-22 08:22:23 +0000
@@ -185,7 +185,7 @@
185 if t == 'error':185 if t == 'error':
186 continue186 continue
187187
188 for tag in ['type', 'name', 'provider']:188 for tag in ['name', 'provider']:
189 t = 'info'189 t = 'info'
190 n = '%s_%s_%s' % (app, account_type, tag)190 n = '%s_%s_%s' % (app, account_type, tag)
191 s = "OK"191 s = "OK"
192192
=== modified file 'clickreviews/tests/test_cr_online_accounts.py'
--- clickreviews/tests/test_cr_online_accounts.py 2015-06-25 19:00:57 +0000
+++ clickreviews/tests/test_cr_online_accounts.py 2015-07-22 08:22:23 +0000
@@ -167,7 +167,7 @@
167 c = ClickReviewAccounts(self.test_name)167 c = ClickReviewAccounts(self.test_name)
168 c.check_service()168 c.check_service()
169 r = c.click_report169 r = c.click_report
170 expected_counts = {'info': 5, 'warn': 0, 'error': 0}170 expected_counts = {'info': 4, 'warn': 0, 'error': 0}
171 self.check_results(r, expected_counts)171 self.check_results(r, expected_counts)
172172
173 def test_check_service_not_specified(self):173 def test_check_service_not_specified(self):
@@ -216,7 +216,7 @@
216 c = ClickReviewAccounts(self.test_name)216 c = ClickReviewAccounts(self.test_name)
217 c.check_service()217 c.check_service()
218 r = c.click_report218 r = c.click_report
219 expected_counts = {'info': None, 'warn': 0, 'error': 1}219 expected_counts = {'info': None, 'warn': 0, 'error': 0}
220 self.check_results(r, expected_counts)220 self.check_results(r, expected_counts)
221221
222 def test_check_service_missing_name(self):222 def test_check_service_missing_name(self):

Subscribers

People subscribed via source and target branches