feat: add refresh-mode value 'ignore-running' (#4749)

Snapd 2.57 allows a new value for `refresh-mode` named `ignore-running`. See canonical/snapd@33acdb6 Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
canonical · Apr 29, 2024 · a76f85a · a76f85a
1 parent d9001c7
commit a76f85a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/schema/snapcraft.json b/schema/snapcraft.json
@@ -775,7 +775,8 @@
                             "description": "controls if the app should be restarted at all",
                             "enum": [
                                 "endure",
-                                "restart"
+                                "restart",
+                                "ignore-running"
                             ]
                         },
                         "stop-mode": {

diff --git a/snapcraft/models/project.py b/snapcraft/models/project.py
@@ -372,7 +372,7 @@ class App(models.CraftBaseModel):
     daemon: Optional[Literal["simple", "forking", "oneshot", "notify", "dbus"]]
     after: UniqueStrList = cast(UniqueStrList, [])
     before: UniqueStrList = cast(UniqueStrList, [])
-    refresh_mode: Optional[Literal["endure", "restart"]]
+    refresh_mode: Optional[Literal["endure", "restart", "ignore-running"]]
     stop_mode: Optional[
         Literal[
             "sigterm",

diff --git a/tests/legacy/unit/project/test_schema.py b/tests/legacy/unit/project/test_schema.py
@@ -502,7 +502,7 @@ def test_valid_restart_conditions(data, condition):
     Validator(data).validate()
 
 
-_REFRESH_MODES = ["endure", "restart"]
+_REFRESH_MODES = ["endure", "restart", "ignore-running"]
 
 
 @pytest.mark.parametrize("mode", _REFRESH_MODES)

diff --git a/tests/unit/models/test_projects.py b/tests/unit/models/test_projects.py
@@ -938,7 +938,9 @@ def test_app_duplicate_before(self, app_yaml_data):
         with pytest.raises(errors.ProjectValidationError, match=error):
             Project.unmarshal(data)
 
-    @pytest.mark.parametrize("refresh_mode", ["endure", "restart", "_invalid"])
+    @pytest.mark.parametrize(
+        "refresh_mode", ["endure", "restart", "ignore-running", "_invalid"]
+    )
     def test_app_refresh_mode(self, refresh_mode, app_yaml_data):
         data = app_yaml_data(refresh_mode=refresh_mode)