schema,tests: add support for new system usernames

Signed-off-by: Alex Lewontin <alex.lewontin@canonical.com>
canonical · Oct 27, 2022 · 1f626e7 · 1f626e7
1 parent 433a092
commit 1f626e7
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/schema/snapcraft.json b/schema/snapcraft.json
@@ -523,7 +523,7 @@
             "additionalProperties": false,
             "validation-failure": "{!r} is not a valid system-username.",
             "patternProperties": {
-                "^snap_(daemon|microk8s)$": {
+                "^snap_(daemon|microk8s|aziotedge|aziotdu)$": {
                     "oneOf": [
                         {
                             "$ref": "#/definitions/system-username-scope"

diff --git a/tests/legacy/unit/project/test_schema.py b/tests/legacy/unit/project/test_schema.py
@@ -1225,13 +1225,29 @@ def test_invalid_command_chain(data, command_chain):
     assert expected_message in str(error.value)
 
 
-@pytest.mark.parametrize("username", ["snap_daemon", "snap_microk8s"])
+@pytest.mark.parametrize(
+    "username",
+    [
+        "snap_daemon",
+        "snap_microk8s",
+        "snap_aziotedge",
+        "snap_aziotdu",
+    ],
+)
 def test_yaml_valid_system_usernames_long(data, username):
     data["system-usernames"] = {username: {"scope": "shared"}}
     Validator(data).validate()
 
 
-@pytest.mark.parametrize("username", ["snap_daemon", "snap_microk8s"])
+@pytest.mark.parametrize(
+    "username",
+    [
+        "snap_daemon",
+        "snap_microk8s",
+        "snap_aziotedge",
+        "snap_aziotdu",
+    ],
+)
 def test_yaml_valid_system_usernames_short(data, username):
     data["system-usernames"] = {username: "shared"}
     Validator(data).validate()

diff --git a/tests/unit/meta/test_snap_yaml.py b/tests/unit/meta/test_snap_yaml.py
@@ -330,6 +330,9 @@ def test_complex_snap_yaml(complex_project, new_dir):
           snap_daemon:
             scope: shared
           snap_microk8s: shared
+          snap_aziotedge: shared
+          snap_aziotdu:
+            scope: shared
         """
     )
 

diff --git a/tests/unit/test_projects.py b/tests/unit/test_projects.py
@@ -1153,8 +1153,12 @@ def test_grammar_syntax_error(self, project_yaml_data):
         [
             {"snap_daemon": {"scope": "shared"}},
             {"snap_microk8s": {"scope": "shared"}},
+            {"snap_aziotedge": {"scope": "shared"}},
+            {"snap_aziotdu": {"scope": "shared"}},
             {"snap_daemon": "shared"},
             {"snap_microk8s": "shared"},
+            {"snap_aziotedge": "shared"},
+            {"snap_aziotdu": "shared"},
         ],
     )
     def test_project_system_usernames_valid(self, system_username, project_yaml_data):