From 98d7acdeb864145748f420a6d9b033fe01b64dfc Mon Sep 17 00:00:00 2001 From: David Murphy Date: Fri, 12 Jul 2024 14:16:35 -0600 Subject: [PATCH] Removed DGM comment and adjusted skip for downgrade --- tests/pytests/pkg/downgrade/test_salt_downgrade.py | 2 +- tests/pytests/pkg/integration/test_enabled_disabled.py | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/pytests/pkg/downgrade/test_salt_downgrade.py b/tests/pytests/pkg/downgrade/test_salt_downgrade.py index 23332d01d89..10e807e617f 100644 --- a/tests/pytests/pkg/downgrade/test_salt_downgrade.py +++ b/tests/pytests/pkg/downgrade/test_salt_downgrade.py @@ -33,7 +33,7 @@ def test_salt_downgrade_minion(salt_call_cli, install_salt): install_salt.prev_version ) < packaging.version.parse("3006.9") - if is_restart_fixed: + if is_restart_fixed and install_salt.distro_id in ("ubuntu", "debian", "macos"): pytest.skip( "Skip package test, since downgrade version is less than " "3006.9 which had fixes for salt-minion restarting, see PR 66218" diff --git a/tests/pytests/pkg/integration/test_enabled_disabled.py b/tests/pytests/pkg/integration/test_enabled_disabled.py index 06990ebde59..9b98d47becd 100644 --- a/tests/pytests/pkg/integration/test_enabled_disabled.py +++ b/tests/pytests/pkg/integration/test_enabled_disabled.py @@ -10,9 +10,6 @@ def test_services(install_salt, salt_call_cli): """ Check if Services are enabled/disabled """ - ## DGM if not install_salt.upgrade: - ## DGM install_salt.install() - services_disabled = [] services_enabled = [] if install_salt.distro_id in ("ubuntu", "debian"):