diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-04-18 09:19:55 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2022-04-18 09:19:55 +0200 |
| commit | 53d3ef904c0cb7f01a8e96868f125b6f75fd633c (patch) | |
| tree | 02e81c361f4de88b996d9784427b575d317840cc /smoketest/scripts/cli/test_service_salt.py | |
| parent | e9d3239c31dbc387edeefa04f5d22534e0e493d5 (diff) | |
| download | vyos-1x-53d3ef904c0cb7f01a8e96868f125b6f75fd633c.tar.gz vyos-1x-53d3ef904c0cb7f01a8e96868f125b6f75fd633c.zip | |
smoketest: salt: add special handling for KVM host
Diffstat (limited to 'smoketest/scripts/cli/test_service_salt.py')
| -rwxr-xr-x | smoketest/scripts/cli/test_service_salt.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/smoketest/scripts/cli/test_service_salt.py b/smoketest/scripts/cli/test_service_salt.py index 68f97acb1..04bae98fa 100755 --- a/smoketest/scripts/cli/test_service_salt.py +++ b/smoketest/scripts/cli/test_service_salt.py @@ -21,6 +21,7 @@ from base_vyostest_shim import VyOSUnitTestSHIM from vyos.util import process_named_running from vyos.util import read_file +from vyos.util import run PROCESS_NAME = 'salt-minion' SALT_CONF = '/etc/salt/minion' @@ -52,7 +53,11 @@ class TestServiceSALT(VyOSUnitTestSHIM.TestCase): self.cli_delete(base_path) self.cli_commit() - self.assertFalse(process_named_running(PROCESS_NAME)) + # For an unknown reason on QEMU systems (e.g. where smoketests are executed + # from the CI) salt-minion process is not killed by systemd. Apparently + # no issue on VMWare. + if run('systemd-detect-virt') != 'kvm': + self.assertFalse(process_named_running(PROCESS_NAME)) def test_default(self): servers = ['192.0.2.1', '192.0.2.2'] |