aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2017-09-11 03:32:19 +0200
committerNeels Hofmeyr <neels@hofmeyr.de>2017-09-11 03:43:20 +0200
commit75e046b278f31afb621722de89a96eb5d8e8674d (patch)
treee949b2091c2eb2b3432e095c36af23a9c2b42b8b
parentbe356ed32fbd28dc8d1460371d9e47511b20ac63 (diff)
fix vty tests: vty no longer goes to parent node implicitly
Fix three instances of VTY tests working because it used to include implicit 'exit' commands to the parent node. Since libosmocore change-id Id73cba2dd34676bad8a130e9c45e67a272f19588 = commit d64b6aed235f6e4d84a2cb8e84b32c3179260254, we no longer do this implicit-exit in interactive VTY shells. *) in testPingPongConfiguration, the intention is to enter the /msc 0 node. Drop prior entry of the 'network' node, which looks like an oversight. So far the 'msc 0' caused an implicit 'exit' and thus worked, now fails. *) Two instances following comments "# Check searching for outer node's commands", which look like they are intended to check for this implicit-exit behavior. This is obsolete, drop those parts of the tests. Change-Id: I77931d6a09c42c443c6936000592f22a7fd06cab
-rw-r--r--tests/vty_test_runner.py22
1 files changed, 0 insertions, 22 deletions
diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py
index 1727e5308..3ecfd3987 100644
--- a/tests/vty_test_runner.py
+++ b/tests/vty_test_runner.py
@@ -139,14 +139,6 @@ class TestVTYBSC(TestVTYGenericBSC):
self.assertTrue(self.vty.verify("exit", ['']))
self.assertTrue(self.vty.node() is None)
- # Check searching for outer node's commands
- self.vty.command("configure terminal")
- self.vty.command('msc 0')
- self.vty.command("bsc")
- self.assertEquals(self.vty.node(), 'config-bsc')
- self.vty.command("msc 0")
- self.assertEquals(self.vty.node(), 'config-msc')
-
def testUssdNotificationsMsc(self):
self.vty.enable()
self.vty.command("configure terminal")
@@ -249,7 +241,6 @@ class TestVTYBSC(TestVTYGenericBSC):
def testPingPongConfiguration(self):
self.vty.enable()
self.vty.verify("configure terminal", [''])
- self.vty.verify("network", [''])
self.vty.verify("msc 0", [''])
self.vty.verify("timeout-ping 12", [''])
@@ -390,19 +381,6 @@ class TestVTYNAT(TestVTYGenericBSC):
self.assertTrue(self.vty.verify('exit', ['']))
self.assertTrue(self.vty.node() is None)
- # Check searching for outer node's commands
- self.vty.command('configure terminal')
- self.vty.command('mgcp')
- self.vty.command('nat')
- self.assertEquals(self.vty.node(), 'config-nat')
- self.vty.command('mgcp')
- self.assertEquals(self.vty.node(), 'config-mgcp')
- self.vty.command('nat')
- self.assertEquals(self.vty.node(), 'config-nat')
- self.vty.command('bsc 0')
- self.vty.command('mgcp')
- self.assertEquals(self.vty.node(), 'config-mgcp')
-
def testRewriteNoRewrite(self):
self.vty.enable()
res = self.vty.command("configure terminal")