Merge remote-tracking branch 'origin/main' into system-usernames-azio…

…tedge

tests/unit/meta/test_snap_yaml.py

@@ -346,6 +346,7 @@ def test_complex_snap_yaml(complex_project, new_dir):
           snap_aziotedge: shared
           snap_aziotdu:
             scope: shared
+        provenance: test-provenance-1
         """
     )
 

tests/unit/test_projects.py

@@ -1025,8 +1025,12 @@ def test_app_sockets_valid_socket_mode(self, socket_mode, socket_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):
@@ -1187,35 +1191,6 @@ def test_grammar_syntax_error(self, project_yaml_data):
         with pytest.raises(errors.ProjectValidationError, match=error):
             GrammarAwareProject.validate_grammar(data)
 
-    @pytest.mark.parametrize(
-        "system_username",
-        [
-            {"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):
-        project = Project.unmarshal(project_yaml_data(system_usernames=system_username))
-        assert project.system_usernames == system_username
-
-    @pytest.mark.parametrize(
-        "system_username",
-        [
-            0,
-            "string",
-        ],
-    )
-    def test_project_system_usernames_invalid(self, system_username, project_yaml_data):
-        error = "- value is not a valid dict"
-        with pytest.raises(errors.ProjectValidationError, match=error):
-            Project.unmarshal(project_yaml_data(system_usernames=system_username))
-
 
 def test_get_snap_project_with_base(snapcraft_yaml):
     project = Project.unmarshal(snapcraft_yaml(base="core22"))