Skip to content

Commit ab9e355

Browse files
dmurphy18dwoz
authored andcommitted
Removed debug statements
1 parent 9c4a13c commit ab9e355

File tree

1 file changed

+3
-24
lines changed

1 file changed

+3
-24
lines changed

tests/pytests/pkg/upgrade/test_salt_upgrade.py

+3-24
Original file line numberDiff line numberDiff line change
@@ -149,34 +149,20 @@ def test_salt_sysv_service_files(salt_call_cli, install_salt):
149149
if not (salt.utils.path.which("dpkg") or salt.utils.path.which("rpm")):
150150
pytest.skip("Not testing on a Debian or RedHat family platform, do not run")
151151

152-
print(
153-
f"DGM test_salt_sysv_service_files entry install_salt, '{install_salt}'",
154-
flush=True,
155-
)
156-
157152
test_pkgs = install_salt.pkgs
158-
print(f"DGM test_salt_sysv_service_files test_pkgs, '{test_pkgs}'", flush=True)
159153
for test_pkg_name in test_pkgs:
160154
test_pkg_basename = os.path.basename(test_pkg_name)
161155
# Debian/Ubuntu name typically salt-minion_300xxxxxx
162156
# Redhat name typically salt-minion-300xxxxxx
163-
test_pkg_basename_dashunderscore = test_pkg_basename.split("300")[0]
164-
test_pkg_basename_adj = test_pkg_basename_dashunderscore[:-1]
165-
print(
166-
f"DGM test_salt_sysv_service_files test_pkg_basename_dashunderscore '{test_pkg_basename_dashunderscore}', test_pkg_basename_adj '{test_pkg_basename_adj}' from name test_pkg_basename '{test_pkg_basename}'",
167-
flush=True,
168-
)
157+
test_pkg_basename_dash_underscore = test_pkg_basename.split("300")[0]
158+
test_pkg_basename_adj = test_pkg_basename_dash_underscore[:-1]
169159
if test_pkg_basename_adj in (
170160
"salt-minion",
171161
"salt-master",
172162
"salt-syndic",
173163
"salt-api",
174164
):
175165
test_initd_name = f"/etc/init.d/{test_pkg_basename_adj}"
176-
print(
177-
f"DGM test_salt_sysv_service_files test_initd_name, '{test_initd_name}' to check against",
178-
flush=True,
179-
)
180166
if salt.utils.path.which("dpkg"):
181167
proc = subprocess.run(
182168
["dpkg", "-q", "-c", f"{test_pkg_name}"],
@@ -192,16 +178,9 @@ def test_salt_sysv_service_files(salt_call_cli, install_salt):
192178
found_line = False
193179
for line in proc.stdout.decode().splitlines():
194180
# If test_initd_name not present we should fail.
195-
print(
196-
f"DGM test_salt_sysv_service_files check line, '{line}'",
197-
flush=True,
198-
)
199181
if line == test_initd_name:
200182
found_line = True
201-
print(
202-
f"DGM test_salt_sysv_service_files test_initd_name, '{test_initd_name}' was FOUND",
203-
flush=True,
204-
)
183+
break
205184

206185
assert found_line
207186

0 commit comments

Comments
 (0)