diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-12-19 06:59:48 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2023-12-19 06:59:48 +0100 |
| commit | b873112dd7253b64d323e183758dbabaa0f28b6e (patch) | |
| tree | b3746bbfd45faec36d113b0a3ed3668ab1828b33 /smoketest/scripts | |
| parent | 259a3d637081fad9f86a8edb39814d8f0fbf7b95 (diff) | |
| download | vyos-1x-b873112dd7253b64d323e183758dbabaa0f28b6e.tar.gz vyos-1x-b873112dd7253b64d323e183758dbabaa0f28b6e.zip | |
smoketest: bgp: T4163: use explicit kill to respawn bgpd process
Diffstat (limited to 'smoketest/scripts')
| -rwxr-xr-x | smoketest/scripts/cli/test_protocols_bgp.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/smoketest/scripts/cli/test_protocols_bgp.py b/smoketest/scripts/cli/test_protocols_bgp.py index 4697d4970..ebc9eeaaa 100755 --- a/smoketest/scripts/cli/test_protocols_bgp.py +++ b/smoketest/scripts/cli/test_protocols_bgp.py @@ -16,7 +16,6 @@ import unittest -from subprocess import run from time import sleep from base_vyostest_shim import VyOSUnitTestSHIM @@ -25,6 +24,7 @@ from vyos.ifconfig import Section from vyos.configsession import ConfigSessionError from vyos.template import is_ipv6 from vyos.utils.process import process_named_running +from vyos.utils.process import cmd PROCESS_NAME = 'bgpd' ASN = '64512' @@ -1162,11 +1162,9 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase): mirror_buffer = '32000000' bmp_path = base_path + ['bmp'] target_path = bmp_path + ['target', target_name] - command = ['/opt/vyatta/bin/vyatta-op-cmd-wrapper', 'restart', 'bgp'] + # by default the 'bmp' module not loaded for the bgpd expect Error self.cli_set(bmp_path) - # by default the 'bmp' module not loaded for the bgpd - # expect Error if not process_named_running('bgpd', 'bmp'): with self.assertRaises(ConfigSessionError): self.cli_commit() @@ -1177,7 +1175,7 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase): self.cli_commit() # restart bgpd to apply "-M bmp" and update PID - run(command, input='Y', text=True) + cmd(f'sudo kill -9 {self.daemon_pid}') # let the bgpd process recover sleep(10) # update daemon PID - this was a planned daemon restart |