review-tools

Merge ~pfsmorigo/review-tools:pfsmorigo/add_microk8s_username into review-tools:master

  1. Git
  2. lp:~pfsmorigo/review-tools
  3. pfsmorigo/add_microk8s_username
  4. Merge into master
Proposed by Paulo Flabiano Smorigo
Status: Merged
Merged at revision: 8a9f1a14df1874d07ab94c325ef7e2b677204432
Proposed branch: ~pfsmorigo/review-tools:pfsmorigo/add_microk8s_username
Merge into: review-tools:master
Diff against target: 83 lines (+11/-11)
3 files modified
reviewtools/overrides.py (+1/-1)
reviewtools/sr_common.py (+1/-1)
reviewtools/tests/test_sr_lint.py (+9/-9)
Reviewer Review Type Date Requested Status
Ian Johnson (community) Approve
Alex Murray Approve
Review via email: mp+405358@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alex Murray (alexmurray) wrote :

LGTM, thanks @pfsmorigo.

review: Approve
Revision history for this message
Ian Johnson (anonymouse67) wrote :

This LGTM

Revision history for this message
Ian Johnson (anonymouse67) wrote :

(forgot to change the review type to approve)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/reviewtools/overrides.py b/reviewtools/overrides.py
2index 7427c90..5463685 100644
3--- a/reviewtools/overrides.py
4+++ b/reviewtools/overrides.py
5@@ -922,7 +922,7 @@ lint_redflagged_base_dep_override = {
6 # For a given snapd_<username>, list the snaps that are allowed to
7 # specify it. Note, as a special case, 'snap_daemon' may be used
8 # by any snap and is not tracked here.
9-lint_system_usernames_override = {"snap_docker": ["docker"]}
10+lint_system_usernames_override = {"snap_microk8s": ["microk8s"]}
11
12 # Some publisher_emails represent a shared account. For snaps with a shared
13 # email, also send to other addresses.
14diff --git a/reviewtools/sr_common.py b/reviewtools/sr_common.py
15index 58941ac..8d3685d 100644
16--- a/reviewtools/sr_common.py
17+++ b/reviewtools/sr_common.py
18@@ -189,7 +189,7 @@ class SnapReview(Review):
19 # IMPORTANT: anything listed here is assumed to be usable by all
20 # snaps. If use of the username should be limited to specific
21 # snaps, also adjust overrides.py:lint_system_usernames_override.
22- valid_system_usernames = ["snap_daemon", "snap_docker"]
23+ valid_system_usernames = ["snap_daemon", "snap_microk8s"]
24
25 valid_compiled_architectures = [
26 "amd64",
27diff --git a/reviewtools/tests/test_sr_lint.py b/reviewtools/tests/test_sr_lint.py
28index 8e303a4..abd970f 100644
29--- a/reviewtools/tests/test_sr_lint.py
30+++ b/reviewtools/tests/test_sr_lint.py
31@@ -5850,9 +5850,9 @@ class TestSnapReviewLint(sr_tests.TestSnapReview):
32 }
33 self.check_results(r, expected=expected)
34
35- def test_check_system_usernames_unsupported_snap_docker_user_for_generic_snap(self):
36+ def test_check_system_usernames_unsupported_snap_microk8s_user_for_generic_snap(self):
37 """Test check_system_usernames - unsupported user"""
38- d = {"snap_docker": "shared"}
39+ d = {"snap_microk8s": "shared"}
40 self.set_test_snap_yaml("system-usernames", d)
41 c = SnapReviewLint(self.test_name)
42 c.check_system_usernames()
43@@ -5861,8 +5861,8 @@ class TestSnapReviewLint(sr_tests.TestSnapReview):
44 self.check_results(r, expected_counts)
45 expected = {
46 "error": {
47- "lint-snap-v2:system-usernames:snap_docker": {
48- "text": "unsupported system-username: snap_docker for snap foo"
49+ "lint-snap-v2:system-usernames:snap_microk8s": {
50+ "text": "unsupported system-username: snap_microk8s for snap foo"
51 }
52 },
53 "warn": {},
54@@ -5874,15 +5874,15 @@ class TestSnapReviewLint(sr_tests.TestSnapReview):
55 """Test check_system_usernames overrides"""
56 from reviewtools.overrides import lint_system_usernames_override
57
58- lint_system_usernames_override["snap_docker"].append("foo")
59+ lint_system_usernames_override["snap_microk8s"].append("foo")
60
61 self.set_test_snap_yaml("name", "foo")
62- self.set_test_snap_yaml("system-usernames", {"snap_docker": "shared"})
63+ self.set_test_snap_yaml("system-usernames", {"snap_microk8s": "shared"})
64 c = SnapReviewLint(self.test_name)
65 c.check_system_usernames()
66
67 # then cleanup the overrides
68- lint_system_usernames_override["snap_docker"].remove("foo")
69+ lint_system_usernames_override["snap_microk8s"].remove("foo")
70
71 r = c.review_report
72 expected_counts = {"info": 2, "warn": 0, "error": 0}
73@@ -5893,8 +5893,8 @@ class TestSnapReviewLint(sr_tests.TestSnapReview):
74 "warn": {},
75 "info": {
76 "lint-snap-v2:system-usernames_valid": {"text": "OK"},
77- "lint-snap-v2:system-usernames:snap_docker": {
78- "text": "OK (override snap_docker for snap: foo)"
79+ "lint-snap-v2:system-usernames:snap_microk8s": {
80+ "text": "OK (override snap_microk8s for snap: foo)"
81 },
82 },
83 }

Subscribers

People subscribed via source and target branches