Enable download test on Windows

saltstack · Sep 24, 2024 · d6eae86 · d6eae86
1 parent 0007447
commit d6eae86
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tests/pytests/pkg/download/test_pkg_download.py b/tests/pytests/pkg/download/test_pkg_download.py
@@ -598,7 +598,6 @@ def salt_test_command(request, install_dir):
     return command
 
 
-@pytest.mark.skip_on_windows(reason="This is flaky on Windows")
 @pytest.mark.parametrize("salt_test_command", get_salt_test_commands(), indirect=True)
 def test_download(shell, salt_test_command):
     """

diff --git a/tools/ci.py b/tools/ci.py
@@ -859,8 +859,9 @@ def pkg_matrix(
         # Uses a jmespath expression to test if the wanted version is in any of the filenames
         key_filter = f"Contents[?contains(Key, '{version}')][]"
         if pkg_type == "MSI":
-            # TODO: Add this back when we add MSI upgrade and downgrade tests
-            # key_filter = f"Contents[?contains(Key, '{version}')] | [?ends_with(Key, '.msi')]"
+            key_filter = (
+                f"Contents[?contains(Key, '{version}')] | [?ends_with(Key, '.msi')]"
+            )
             continue
         elif pkg_type == "NSIS":
             key_filter = (
@@ -897,7 +898,7 @@ def pkg_matrix(
         and "macos" in distro_slug
         and "arm64" in distro_slug
     ):
-        ctx.warn("Forks don't have access to MacOS 13 Arm64. Clearning the matrix.")
+        ctx.warn("Forks don't have access to MacOS 13 Arm64. Clearing the matrix.")
         _matrix.clear()
 
     if not _matrix: