summaryrefslogtreecommitdiff
path: root/smoketest/scripts/cli
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2026-02-09 21:51:22 +0100
committerChristian Breunig <christian@breunig.cc>2026-02-09 21:51:22 +0100
commit6bf3561507e9f718554bfd2c288c61950f246274 (patch)
tree266d8a57c45a0cc910592e4cd509c2ffc1c92d20 /smoketest/scripts/cli
parent9707b90b9ddacd27b74ef235a6f5a8f585c2bc50 (diff)
downloadvyos-1x-6bf3561507e9f718554bfd2c288c61950f246274.tar.gz
vyos-1x-6bf3561507e9f718554bfd2c288c61950f246274.zip
smoketest: T8248: fix process_named_running() after switching salt-minion build
After removing the salt-minion upstream repo and building salt from source in https://github.com/vyos/vyos-build/pull/1112 the binary ships its own Python interpreter which must be accounted for in our smoketests.
Diffstat (limited to 'smoketest/scripts/cli')
-rwxr-xr-xsmoketest/scripts/cli/test_service_salt-minion.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/smoketest/scripts/cli/test_service_salt-minion.py b/smoketest/scripts/cli/test_service_salt-minion.py
index 483e829bc..494e02aa5 100755
--- a/smoketest/scripts/cli/test_service_salt-minion.py
+++ b/smoketest/scripts/cli/test_service_salt-minion.py
@@ -23,7 +23,6 @@ from vyos.utils.process import process_named_running
from vyos.utils.file import read_file
from vyos.utils.process import cmd
-PROCESS_NAME = 'salt-minion'
SALT_CONF = '/etc/salt/minion'
base_path = ['service', 'salt-minion']
@@ -47,7 +46,7 @@ class TestServiceSALT(VyOSUnitTestSHIM.TestCase):
def tearDown(self):
# Check for running process
- self.assertTrue(process_named_running(PROCESS_NAME))
+ self.assertTrue(process_named_running('python3.11', '/usr/bin/salt-minion'))
# delete testing SALT config
self.cli_delete(base_path)
@@ -57,7 +56,7 @@ class TestServiceSALT(VyOSUnitTestSHIM.TestCase):
# from the CI) salt-minion process is not killed by systemd. Apparently
# no issue on VMWare.
if cmd('systemd-detect-virt') != 'kvm':
- self.assertFalse(process_named_running(PROCESS_NAME))
+ self.assertFalse(process_named_running('python3.11', '/usr/bin/salt-minion'))
# always forward to base class
super().tearDown()