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.orgNeels Hofmeyr has submitted this change and it was merged. Change subject: propagate Timeout class to test scope, use in debug suite ...................................................................... propagate Timeout class to test scope, use in debug suite Change-Id: Idad34fe799bc8b8e03d773898473773656b005bd --- M src/osmo_gsm_tester/suite.py M src/osmo_gsm_tester/test.py M suites/debug/interactive.py 3 files changed, 9 insertions(+), 4 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py index 2313ae2..0ffa434 100644 --- a/src/osmo_gsm_tester/suite.py +++ b/src/osmo_gsm_tester/suite.py @@ -93,7 +93,7 @@ def run(self, suite_run): assert self.suite is suite_run.definition with self: - test.setup(suite_run, self, ofono_client) + test.setup(suite_run, self, ofono_client, sys.modules[__name__]) success = False try: self.log('START') diff --git a/src/osmo_gsm_tester/test.py b/src/osmo_gsm_tester/test.py index e52b545..871e3ae 100644 --- a/src/osmo_gsm_tester/test.py +++ b/src/osmo_gsm_tester/test.py @@ -31,9 +31,10 @@ sleep = None poll = None prompt = None +Timeout = None -def setup(suite_run, _test, ofono_client): - global trial, suite, test, resources, log, dbg, err, wait, sleep, poll, prompt +def setup(suite_run, _test, ofono_client, suite_module): + global trial, suite, test, resources, log, dbg, err, wait, sleep, poll, prompt, Timeout trial = suite_run.trial suite = suite_run test = _test @@ -45,5 +46,6 @@ sleep = suite_run.sleep poll = suite_run.poll prompt = suite_run.prompt + Timeout = suite_module.Timeout # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/suites/debug/interactive.py b/suites/debug/interactive.py index ff5da30..603e395 100755 --- a/suites/debug/interactive.py +++ b/suites/debug/interactive.py @@ -24,7 +24,10 @@ if 'quit'.startswith(cmd): break elif 'wait-registered'.startswith(cmd): - wait(nitb.subscriber_attached, *modems) + try: + wait(nitb.subscriber_attached, *modems) + except Timeout: + print('Timeout while waiting for registration.') elif 'get-registered'.startswith(cmd): print(nitb.imsi_list_attached()) print('RESULT: %s' % -- To view, visit https://gerrit.osmocom.org/2514 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idad34fe799bc8b8e03d773898473773656b005bd Gerrit-PatchSet: 4 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de> Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>