Remove debug statements, and additions made from 67914 WIP Fix nightly build package test failures

Author: dmurphy18

noxfile.py

@@ -1911,7 +1911,7 @@ def ci_test_onedir_pkgs(session):
     except CommandFailed:
         if os.environ.get("RERUN_FAILURES", "0") == "0":
             # Don't rerun on failures
-            sys.exit(1)
+            return
 
         # Don't print the system information, not the test selection on reruns
         global PRINT_TEST_SELECTION
@@ -1947,7 +1947,7 @@ def ci_test_onedir_pkgs(session):
             common_pytest_args[:]
             + cmd_args[:]
             + [
-                "--no-uninstall",
+                "--no-install",
                 "--junitxml=artifacts/xml-unittests-output/test-results-install.xml",
                 "--log-file=artifacts/logs/runtests-install.log",
             ]
@@ -1962,7 +1962,7 @@ def ci_test_onedir_pkgs(session):
         except CommandFailed:
             if os.environ.get("RERUN_FAILURES", "0") == "0":
                 # Don't rerun on failures
-                sys.exit(1)
+                return
             cmd_args = chunks["install"]
             pytest_args = (
                 common_pytest_args[:]

salt/version.py

@@ -456,7 +456,7 @@ def string(self):
             version_string += f".{self.mbugfix}"
         if self.pre_type:
             version_string += f"{self.pre_type}{self.pre_num}"
-        if self.noc is not None and self.sha:
+        if self.noc and self.sha:
             noc = self.noc
             if noc < 0:
                 noc = "0na"

tests/pytests/pkg/integration/test_version.py

@@ -104,10 +104,7 @@ def test_compare_versions(binary, install_salt):
     """
     Test compare versions
     """
-    if install_salt.use_prev_version:
-        version = install_salt.prev_version
-    else:
-        version = install_salt.artifact_version
+    version = install_salt.artifact_version
     if binary in install_salt.binary_paths:
         if install_salt.upgrade:
             install_salt.install()

tests/pytests/pkg/upgrade/test_salt_upgrade.py

@@ -105,7 +105,7 @@ def salt_test_upgrade(
     new_minion_pids = _get_running_named_salt_pid(process_minion_name)
     new_master_pids = _get_running_named_salt_pid(process_master_name)
 
-    if sys.platform == "linux" and install_salt.distro_id not in ("ubuntu", "debian"):
+    if sys.platform == "linux":
         assert new_minion_pids
         assert new_master_pids
         assert new_minion_pids != old_minion_pids
@@ -149,34 +149,20 @@ def test_salt_sysv_service_files(install_salt):
     if not (salt.utils.path.which("dpkg") or salt.utils.path.which("rpm")):
         pytest.skip("Not testing on a Debian or RedHat family platform, do not run")
 
-    print(
-        f"DGM test_salt_sysv_service_files entry install_salt, '{install_salt}'",
-        flush=True,
-    )
-
     test_pkgs = install_salt.pkgs
-    print(f"DGM test_salt_sysv_service_files test_pkgs, '{test_pkgs}'", flush=True)
     for test_pkg_name in test_pkgs:
         test_pkg_basename = os.path.basename(test_pkg_name)
         # Debian/Ubuntu name typically salt-minion_300xxxxxx
         # Redhat name typically salt-minion-300xxxxxx
         test_pkg_basename_dash_underscore = test_pkg_basename.split("300")[0]
         test_pkg_basename_adj = test_pkg_basename_dash_underscore[:-1]
-        print(
-            f"DGM test_salt_sysv_service_files test_pkg_basename_dash_underscore '{test_pkg_basename_dash_underscore}', test_pkg_basename_adj '{test_pkg_basename_adj}' from name test_pkg_basename '{test_pkg_basename}'",
-            flush=True,
-        )
         if test_pkg_basename_adj in (
             "salt-minion",
             "salt-master",
             "salt-syndic",
             "salt-api",
         ):
             test_initd_name = f"/etc/init.d/{test_pkg_basename_adj}"
-            print(
-                f"DGM test_salt_sysv_service_files test_initd_name, '{test_initd_name}' to check against",
-                flush=True,
-            )
             if salt.utils.path.which("dpkg"):
                 proc = subprocess.run(
                     ["dpkg", "-c", f"{test_pkg_name}"],
@@ -192,16 +178,8 @@ def test_salt_sysv_service_files(install_salt):
             found_line = False
             for line in proc.stdout.decode().splitlines():
                 # If test_initd_name not present we should fail.
-                print(
-                    f"DGM test_salt_sysv_service_files check line, '{line}'",
-                    flush=True,
-                )
                 if test_initd_name in line:
                     found_line = True
-                    print(
-                        f"DGM test_salt_sysv_service_files test_initd_name, '{test_initd_name}' was FOUND",
-                        flush=True,
-                    )
                     break
 
             assert found_line