fix more failing tests

saltstack · Sep 28, 2022 · 8b79834 · 8b79834
1 parent 7077b34
commit 8b79834
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tests/pytests/functional/utils/functools/test_namespaced_function.py b/tests/pytests/functional/utils/functools/test_namespaced_function.py
@@ -111,7 +111,7 @@ def foo():
 
     assert str(w[-1].message) == (
         "Passing 'defaults' to 'namespaced_function' is deprecated, slated "
-        "for removal in 3008 and no longer does anything for the function "
+        "for removal in 3008.0 (Argon) and no longer does anything for the function "
         "being namespaced."
     )
 
@@ -127,6 +127,6 @@ def foo():
 
     assert str(w[-1].message) == (
         "Passing 'preserve_context' to 'namespaced_function' is deprecated, slated "
-        "for removal in 3008 and no longer does anything for the function "
+        "for removal in 3008.0 (Argon) and no longer does anything for the function "
         "being namespaced."
     )
diff --git a/tests/pytests/unit/modules/test_salt_version.py b/tests/pytests/unit/modules/test_salt_version.py
@@ -19,7 +19,7 @@ def test_mocked_objects():
     for k, v in salt.version.SaltStackVersion.LNAMES.items():
         assert k == k.lower()
         assert isinstance(v, tuple)
-        if sv.new_version(major=v[0]):
+        if sv.new_version(major=v[0]) and not sv.can_have_dot_zero(major=v[0]):
             assert len(v) == 1
         else:
             assert len(v) == 2