summaryrefslogtreecommitdiffstats
path: root/openbsc/tests/vty_test_runner.py
diff options
context:
space:
mode:
authorMax <msuraev@sysmocom.de>2016-06-22 14:02:39 +0200
committerHarald Welte <laforge@gnumonks.org>2016-06-29 16:45:14 +0000
commit488902db2ac6c8815cb50dac0aab32f96190cd65 (patch)
treed48a26b770aa1c668055126b3228d45a321ab15e /openbsc/tests/vty_test_runner.py
parentdd49beebb179d12fd156d22337d645340609addc (diff)
Fix vty tests with subscriber deletion
Use correct vty command for subscriber deletion, adjust assertions accordingly. The error was cause by inconsistent syntax of vty commands for subscriber creation and deletion. Change-Id: I9b9376b4ac0ec066000545167de312ca4460493b
Diffstat (limited to 'openbsc/tests/vty_test_runner.py')
-rw-r--r--openbsc/tests/vty_test_runner.py20
1 files changed, 11 insertions, 9 deletions
diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py
index 9ea988d62..bae18669c 100644
--- a/openbsc/tests/vty_test_runner.py
+++ b/openbsc/tests/vty_test_runner.py
@@ -388,12 +388,12 @@ class TestVTYNITB(TestVTYGenericBSC):
self.assert_(res.find(" IMSI: "+imsi) > 0)
# Delete it
- res = self.vty.command('subscriber delete imsi '+imsi)
- self.assert_(res != "")
+ res = self.vty.command('subscriber imsi ' + imsi + ' delete')
+ self.assert_("" == res)
# Now it should not be there anymore
res = self.vty.command('show subscriber imsi '+imsi)
- self.assert_(res != '% No subscriber found for imsi '+imsi)
+ self.assert_(('% No subscriber found for imsi ' + imsi) == res)
def testSubscriberCreateDelete(self):
@@ -413,12 +413,12 @@ class TestVTYNITB(TestVTYGenericBSC):
self.assert_(res.find(" IMSI: "+imsi) > 0)
# Delete it
- res = self.vty.command('subscriber delete imsi '+imsi)
- self.assert_(res != "")
+ res = self.vty.command('subscriber imsi ' + imsi + ' delete')
+ self.assert_("" == res)
# Now it should not be there anymore
res = self.vty.command('show subscriber imsi '+imsi)
- self.assert_(res != '% No subscriber found for imsi '+imsi)
+ self.assert_(('% No subscriber found for imsi ' + imsi) == res)
def testSubscriberSettings(self):
self.vty.enable()
@@ -456,16 +456,18 @@ class TestVTYNITB(TestVTYGenericBSC):
self.assertTrue(self.vty.verify("subscriber-create-on-demand random 221 222", ['']))
self.vty.command("end")
+ # create subscriber with extension in a configured interval
res = self.vty.command('subscriber create imsi ' + imsi2)
self.assert_(res.find(" IMSI: " + imsi2) > 0)
self.assert_(res.find("221") > 0 or res.find("222") > 0)
self.assert_(res.find(" Extension: ") > 0)
# Delete it
- res = self.vty.command('subscriber delete imsi '+imsi)
- self.assert_(res != "")
- res = self.vty.command('subscriber delete imsi ' + imsi2)
+ res = self.vty.command('subscriber imsi ' + imsi + ' delete')
self.assert_(res != "")
+ # imsi2 is inactive so deletion should succeed
+ res = self.vty.command('subscriber imsi ' + imsi2 + ' delete')
+ self.assert_("" == res)
def testShowPagingGroup(self):
res = self.vty.command("show paging-group 255 1234567")