[PATCH 1/5] vty: Fix whitespace in test script

Expands leading tabs and removes trailing whitespace. Sponsored-by: On-Waves ehf --- openbsc/src/gprs/gb_proxy.c | 1 - openbsc/tests/vty_test_runner.py | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/openbsc/src/gprs/gb_proxy.c b/openbsc/src/gprs/gb_proxy.c index dea6e3f..d075578 100644 --- a/openbsc/src/gprs/gb_proxy.c +++ b/openbsc/src/gprs/gb_proxy.c @@ -204,7 +204,6 @@ static struct gbprox_peer *peer_alloc(uint16_t bvci) return peer; } -static void peer_free(struct gbprox_peer *peer) __attribute__((__unused__)); static void peer_free(struct gbprox_peer *peer) { llist_del(&peer->list); diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py index 0bd7972..09352b8 100644 --- a/openbsc/tests/vty_test_runner.py +++ b/openbsc/tests/vty_test_runner.py @@ -72,7 +72,7 @@ class TestVTYGenericBSC(TestVTYBase): try: self.checkForEndAndExit() except BaseException as e: - sys.stderr.write('Expected and ignored failure: %s\n' % (str(e))) + sys.stderr.write('Expected and ignored failure: %s\n' % (str(e))) def _testConfigNetworkTree(self): self.vty.enable() @@ -118,7 +118,7 @@ class TestVTYNITB(TestVTYGenericBSC): return (4242, "./src/osmo-nitb/osmo-nitb", "OpenBSC", "nitb") def testConfigNetworkTree(self): - self._testConfigNetworkTree() + self._testConfigNetworkTree() def checkForSmpp(self): """SMPP is not always enabled, check if it is""" @@ -137,10 +137,10 @@ class TestVTYNITB(TestVTYGenericBSC): if self.checkForSmpp(): self.assertEquals(self.vty.node(), 'config') - self.assertTrue(self.vty.verify('smpp', [''])) - self.assertEquals(self.vty.node(), 'config-smpp') - self.ignoredCheckForEndAndExit() - self.assertTrue(self.vty.verify("exit", [''])) + self.assertTrue(self.vty.verify('smpp', [''])) + self.assertEquals(self.vty.node(), 'config-smpp') + self.ignoredCheckForEndAndExit() + self.assertTrue(self.vty.verify("exit", [''])) self.assertEquals(self.vty.node(), 'config') self.assertTrue(self.vty.verify("exit", [''])) @@ -241,7 +241,7 @@ class TestVTYBSC(TestVTYGenericBSC): return (4242, "./src/osmo-bsc/osmo-bsc", "OsmoBSC", "bsc") def testConfigNetworkTree(self): - self._testConfigNetworkTree() + self._testConfigNetworkTree() def testVtyTree(self): self.vty.enable() -- 1.7.9.5