From a030eeb81b0f637f248c19353e36bead4938eb1d Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 24 Mar 2021 17:51:29 +0100 Subject: smoketest: isis: drop trailing whitespace on "router isis" statement After upgrading FRR to a newer revision in stable/7.5 branch we can drop the workaround where an additional whitespace was required after the "router isis FOOO " statement. Related to https://github.com/FRRouting/frr/pull/8306 --- smoketest/scripts/cli/test_protocols_isis.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/smoketest/scripts/cli/test_protocols_isis.py b/smoketest/scripts/cli/test_protocols_isis.py index 10c722eca..623cb044d 100755 --- a/smoketest/scripts/cli/test_protocols_isis.py +++ b/smoketest/scripts/cli/test_protocols_isis.py @@ -56,8 +56,7 @@ class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase): self.cli_commit() # Verify all changes - # XXX: FRR represents router isis with a trailing whitespace :/ - tmp = self.getFRRconfig(f'router isis {domain} ') + tmp = self.getFRRconfig(f'router isis {domain}') self.assertIn(f' net {net}', tmp) self.assertIn(f' redistribute ipv4 connected level-2 route-map {route_map}', tmp) @@ -88,8 +87,7 @@ class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase): self.cli_commit() # Verify FRR isisd configuration - # XXX: FRR represents router isis with a trailing whitespace :/ - tmp = self.getFRRconfig(f'router isis {domain} ') + tmp = self.getFRRconfig(f'router isis {domain}') self.assertIn(f'router isis {domain}', tmp) self.assertIn(f' net {net}', tmp) -- cgit v1.2.3