diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2026-02-10 11:43:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-10 11:43:49 +0200 |
| commit | 4313abf5e186a6b709e1ec6f15551bd8893934a4 (patch) | |
| tree | 266d8a57c45a0cc910592e4cd509c2ffc1c92d20 | |
| parent | 9707b90b9ddacd27b74ef235a6f5a8f585c2bc50 (diff) | |
| parent | 6bf3561507e9f718554bfd2c288c61950f246274 (diff) | |
| download | vyos-1x-4313abf5e186a6b709e1ec6f15551bd8893934a4.tar.gz vyos-1x-4313abf5e186a6b709e1ec6f15551bd8893934a4.zip | |
Merge pull request #4977 from c-po/fix-salt-minion-testcase
smoketest: T8248: fix process_named_running() after switching salt-minion build
| -rwxr-xr-x | smoketest/scripts/cli/test_service_salt-minion.py | 5 |
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() |