Canonical Click Reviewers tools (obsolete)

Merge lp:~sergiusens/click-reviewers-tools/vendorless into lp:click-reviewers-tools

  1. vendorless
  2. Merge into trunk
Proposed by Sergio Schvezov
Status: Merged
Merged at revision: 545
Proposed branch: lp:~sergiusens/click-reviewers-tools/vendorless
Merge into: lp:click-reviewers-tools
Diff against target: 51 lines (+4/-5)
3 files modified
clickreviews/cr_lint.py (+3/-1)
clickreviews/cr_tests.py (+0/-3)
clickreviews/tests/test_cr_lint.py (+1/-1)
To merge this branch: bzr merge lp:~sergiusens/click-reviewers-tools/vendorless
Reviewer Review Type Date Requested Status
Jamie Strandboge (community) Approve
Review via email: mp+277224@code.launchpad.net

Commit message

Removing vendor/Maintainer checks for snaps

Description of the change

A quick check did not expose any scenario where this would affect bus-name being checked.

To post a comment you must log in.
Revision history for this message
Jamie Strandboge (jdstrand) wrote :

Thanks! There were also some other checks that needed to be disabled, but I took care of those in r544.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'clickreviews/cr_lint.py'
2--- clickreviews/cr_lint.py 2015-10-27 16:03:56 +0000
3+++ clickreviews/cr_lint.py 2015-11-11 10:40:51 +0000
4@@ -185,10 +185,12 @@
5 'Version',
6 'Click-Version',
7 'Architecture',
8- 'Maintainer',
9 'Installed-Size',
10 'Description']
11
12+ if not self.is_snap:
13+ fields.append('Maintainer')
14+
15 error = False
16 for f in sorted(fields):
17 t = 'info'
18
19=== modified file 'clickreviews/cr_tests.py'
20--- clickreviews/cr_tests.py 2015-10-27 16:27:10 +0000
21+++ clickreviews/cr_tests.py 2015-11-11 10:40:51 +0000
22@@ -389,8 +389,6 @@
23 self.set_test_control('Version', "1.0")
24 self.set_test_control('Click-Version', MINIMUM_CLICK_FRAMEWORK_VERSION)
25 self.set_test_control('Architecture', "all")
26- self.set_test_control('Maintainer',
27- "Some User <some.user@example.com>")
28 self.set_test_control('Installed-Size', "111")
29 self.set_test_control('Description', "My Test App")
30
31@@ -399,7 +397,6 @@
32 self.set_test_manifest("description",
33 "Some longish description of My Test App")
34 self.set_test_manifest("framework", "ubuntu-sdk-13.10")
35- self.set_test_manifest("maintainer", self.test_control['Maintainer'])
36 self.set_test_manifest("name", self.test_control['Package'])
37 self.set_test_manifest("title", self.test_control['Description'])
38 self.set_test_manifest("version", self.test_control['Version'])
39
40=== modified file 'clickreviews/tests/test_cr_lint.py'
41--- clickreviews/tests/test_cr_lint.py 2015-10-27 08:51:12 +0000
42+++ clickreviews/tests/test_cr_lint.py 2015-11-11 10:40:51 +0000
43@@ -195,7 +195,7 @@
44 c.is_snap = True
45 c.check_control()
46 r = c.click_report
47- expected_counts = {'info': 15, 'warn': 0, 'error': 0}
48+ expected_counts = {'info': 14, 'warn': 0, 'error': 0}
49 self.check_results(r, expected_counts)
50
51 def test_check_control_manifest_architecture_missing(self):

Subscribers

People subscribed via source and target branches