summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-03-24 17:51:29 +0100
committerChristian Poessinger <christian@poessinger.com>2021-03-24 17:51:42 +0100
commita030eeb81b0f637f248c19353e36bead4938eb1d (patch)
tree8029b14ee0ec2a4e9b9602037623e09070d5896b
parent064d0a4488392ea3c3bd458075dc0d754e0c0363 (diff)
downloadvyos-1x-a030eeb81b0f637f248c19353e36bead4938eb1d.tar.gz
vyos-1x-a030eeb81b0f637f248c19353e36bead4938eb1d.zip
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
-rwxr-xr-xsmoketest/scripts/cli/test_protocols_isis.py6
1 files 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)