From d33a8b7b4a690e57c1b569a3fa961c57fef01187 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 15 Apr 2023 17:28:31 +0100 Subject: [PATCH] Only show the warnings when running the download package tests Signed-off-by: Pedro Algarvio --- noxfile.py | 1 + pkg/tests/download/test_pkg_download.py | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/noxfile.py b/noxfile.py index 826864f8fb0..9a7afa93bdc 100644 --- a/noxfile.py +++ b/noxfile.py @@ -1790,6 +1790,7 @@ def test_pkgs_onedir(session): env = { "ONEDIR_TESTRUN": "1", + "PKG_TEST_TYPE": chunk, } if chunk == "upgrade-classic": diff --git a/pkg/tests/download/test_pkg_download.py b/pkg/tests/download/test_pkg_download.py index 76c47bc1f0b..bbe26df549f 100644 --- a/pkg/tests/download/test_pkg_download.py +++ b/pkg/tests/download/test_pkg_download.py @@ -257,13 +257,16 @@ def root_url(salt_release): def get_salt_release(): salt_release = os.environ.get("SALT_RELEASE") + pkg_test_type = os.environ.get("PKG_TEST_TYPE", "install") if salt_release is None: - log.warning( - "Setting salt release to 3006.0rc2 which is probably not what you want." - ) + if pkg_test_type == "download-pkgs": + log.warning( + "Setting salt release to 3006.0rc2 which is probably not what you want." + ) salt_release = "3006.0rc2" - if packaging.version.parse(salt_release) < packaging.version.parse("3006.0rc1"): - log.warning(f"The salt release being tested, {salt_release!r} looks off.") + if pkg_test_type == "download-pkgs": + if packaging.version.parse(salt_release) < packaging.version.parse("3006.0rc1"): + log.warning(f"The salt release being tested, {salt_release!r} looks off.") return salt_release