This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Neels Hofmeyr gerrit-no-reply at lists.osmocom.orgHello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/968
to look at the new patch set (#3).
NOT FOR MERGE: testrun for vty_test_runner.py on jenkins
Change-Id: I5f93af0155a1f465cce1f505098efb5e5e2aa9cb
---
M openbsc/tests/vty_test_runner.py
1 file changed, 20 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/68/968/3
diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py
index f624fc9..6f84d03 100644
--- a/openbsc/tests/vty_test_runner.py
+++ b/openbsc/tests/vty_test_runner.py
@@ -1234,13 +1234,25 @@
if (verbose):
print "MSC is ready at " + ip
conn = None
- while "MSC is connected: 0" == x.vty.command("show msc connection"):
- conn, addr = msc.accept()
- if (verbose):
- print "MSC got connection from ", addr
+ while True:
+ connected = x.vty.command("show msc connection")
+ print "'show msc connection' says: %r" % connected
+ if connected != "MSC is connected: 0":
+ break;
+
+ timeout_retries = 3
+ while timeout_retries > 0:
+ try:
+ conn, addr = msc.accept()
+ if (verbose):
+ print "MSC got connection from ", addr
+ break
+ except socket.timeout:
+ timeout_retries -= 1
+ continue
if not conn:
- raise Exception("VTY reports MSC is connected, but I haven't"
- " connected yet: %r %r" % (ip, port))
+ raise Exception("VTY reports MSC is connected, but I haven't"
+ " connected yet: %r %r" % (ip, port))
return conn
def ipa_handle_small(x, verbose = False):
@@ -1340,7 +1352,7 @@
add_nat_test(suite, workdir)
add_gbproxy_test(suite, workdir)
add_sgsn_test(suite, workdir)
- res = unittest.TextTestRunner(verbosity=verbose_level).run(suite)
+ res = unittest.TextTestRunner(verbosity=verbose_level, stream=sys.stdout).run(suite)
sys.exit(len(res.errors) + len(res.failures))
-# vim: set shiftwidth=4 expandtab nocin ai
+# vim: shiftwidth=4 expandtab nocin ai
--
To view, visit https://gerrit.osmocom.org/968
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I5f93af0155a1f465cce1f505098efb5e5e2aa9cb
Gerrit-PatchSet: 3
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder