diff options
| author | sarthurdev <965089+sarthurdev@users.noreply.github.com> | 2023-03-23 14:50:51 +0100 |
|---|---|---|
| committer | sarthurdev <965089+sarthurdev@users.noreply.github.com> | 2023-03-23 14:50:51 +0100 |
| commit | 98940e92d5c75d9f112a19e3f12ac1d4a257667c (patch) | |
| tree | 1bc983f3cfae07a87faa3b26c0672c709d7605ee | |
| parent | 7380bf1216399f905fe85ff26eaa0272b9f6dfe0 (diff) | |
| download | vyos-1x-98940e92d5c75d9f112a19e3f12ac1d4a257667c.tar.gz vyos-1x-98940e92d5c75d9f112a19e3f12ac1d4a257667c.zip | |
ipsec: T5003: Resolve issue with ipsec DHCP test
tearDown checks for existence of charon process, however this test does not create any connections by design.
| -rwxr-xr-x | smoketest/scripts/cli/test_vpn_ipsec.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/smoketest/scripts/cli/test_vpn_ipsec.py b/smoketest/scripts/cli/test_vpn_ipsec.py index 61363b853..b677f0e45 100755 --- a/smoketest/scripts/cli/test_vpn_ipsec.py +++ b/smoketest/scripts/cli/test_vpn_ipsec.py @@ -117,6 +117,8 @@ rgiyCHemtMepq57Pl1Nmj49eEA== """ class TestVPNIPsec(VyOSUnitTestSHIM.TestCase): + skip_process_check = False + @classmethod def setUpClass(cls): super(TestVPNIPsec, cls).setUpClass() @@ -141,7 +143,10 @@ class TestVPNIPsec(VyOSUnitTestSHIM.TestCase): def tearDown(self): # Check for running process - self.assertTrue(process_named_running(PROCESS_NAME)) + if not self.skip_process_check: + self.assertTrue(process_named_running(PROCESS_NAME)) + else: + self.skip_process_check = False # Reset self.cli_delete(base_path) self.cli_delete(tunnel_path) @@ -151,6 +156,9 @@ class TestVPNIPsec(VyOSUnitTestSHIM.TestCase): self.assertFalse(process_named_running(PROCESS_NAME)) def test_01_dhcp_fail_handling(self): + # Skip process check - connection is not created for this test + self.skip_process_check = True + # Interface for dhcp-interface self.cli_set(ethernet_path + [interface, 'vif', vif, 'address', 'dhcp']) # Use VLAN to avoid getting IP from qemu dhcp server |