<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18756">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tests: Replace is_connected() with is_registered()<br><br>API was renamed and old name deprecated, let's use it everywhere.<br><br>Change-Id: Ic91dddcfd1a5a17c35d15a8a14628b3923229523<br>---<br>M doc/examples/2g_osmocom/suites/sms/mo_mt_sms.py<br>M doc/examples/4g_srsLTE/suites/4g/iperf3_dl.py<br>M doc/examples/4g_srsLTE/suites/4g/iperf3_ul.py<br>M doc/examples/4g_srsLTE/suites/4g/ping.py<br>M src/osmo_gsm_tester/obj/ms_ofono.py<br>M sysmocom/suites/debug/interactive.py<br>M sysmocom/suites/dynts/switch_tch_pdch.py<br>M sysmocom/suites/encryption/lib/testlib.py<br>M sysmocom/suites/gprs/lib/testlib.py<br>M sysmocom/suites/gprs/ping.py<br>M sysmocom/suites/gprs/ping_idle_ping.py<br>M sysmocom/suites/nitb_debug/interactive.py<br>M sysmocom/suites/nitb_netreg/register.py<br>M sysmocom/suites/nitb_netreg/register_default.py<br>M sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py<br>M sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py<br>M sysmocom/suites/nitb_sms/mo_mt_sms.py<br>M sysmocom/suites/nitb_ussd/assert_extension.py<br>M sysmocom/suites/smpp/esme_ms_sms_storeforward.py<br>M sysmocom/suites/smpp/esme_ms_sms_transaction.py<br>M sysmocom/suites/sms/mo_mt_sms.py<br>M sysmocom/suites/ussd/assert_extension.py<br>M sysmocom/suites/voice/lib/testlib.py<br>23 files changed, 30 insertions(+), 34 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/examples/2g_osmocom/suites/sms/mo_mt_sms.py b/doc/examples/2g_osmocom/suites/sms/mo_mt_sms.py</span><br><span>index 51e78c0..d7606e4 100755</span><br><span>--- a/doc/examples/2g_osmocom/suites/sms/mo_mt_sms.py</span><br><span>+++ b/doc/examples/2g_osmocom/suites/sms/mo_mt_sms.py</span><br><span>@@ -33,8 +33,8 @@</span><br><span> ms_mt.log_info()</span><br><span> </span><br><span> print('waiting for modems to attach...')</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ms_mo.is_connected, msc.mcc_mnc())</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ms_mt.is_connected, msc.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ms_mo.is_registered, msc.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ms_mt.is_registered, msc.mcc_mnc())</span><br><span> wait(msc.subscriber_attached, ms_mo, ms_mt)</span><br><span> </span><br><span> sms = ms_mo.sms_send(ms_mt)</span><br><span>diff --git a/doc/examples/4g_srsLTE/suites/4g/iperf3_dl.py b/doc/examples/4g_srsLTE/suites/4g/iperf3_dl.py</span><br><span>index d90c80b..d84c078 100755</span><br><span>--- a/doc/examples/4g_srsLTE/suites/4g/iperf3_dl.py</span><br><span>+++ b/doc/examples/4g_srsLTE/suites/4g/iperf3_dl.py</span><br><span>@@ -26,7 +26,7 @@</span><br><span> proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_DL, ue.netns(), bitrate=max_rate)</span><br><span> </span><br><span> print('waiting for UE to attach...')</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ue.is_connected, None)</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ue.is_registered, None)</span><br><span> print('UE is attached')</span><br><span> </span><br><span> print("Running iperf3 client to %s through %s" % (str(iperf3cli), ue.netns()))</span><br><span>diff --git a/doc/examples/4g_srsLTE/suites/4g/iperf3_ul.py b/doc/examples/4g_srsLTE/suites/4g/iperf3_ul.py</span><br><span>index 453cdfa..2592632 100755</span><br><span>--- a/doc/examples/4g_srsLTE/suites/4g/iperf3_ul.py</span><br><span>+++ b/doc/examples/4g_srsLTE/suites/4g/iperf3_ul.py</span><br><span>@@ -26,7 +26,7 @@</span><br><span> proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_UL, ue.netns(), bitrate=max_rate)</span><br><span> </span><br><span> print('waiting for UE to attach...')</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ue.is_connected, None)</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ue.is_registered, None)</span><br><span> print('UE is attached')</span><br><span> </span><br><span> print("Running iperf3 client to %s through %s" % (str(iperf3cli), ue.netns()))</span><br><span>diff --git a/doc/examples/4g_srsLTE/suites/4g/ping.py b/doc/examples/4g_srsLTE/suites/4g/ping.py</span><br><span>index c81a35d..ca35053 100755</span><br><span>--- a/doc/examples/4g_srsLTE/suites/4g/ping.py</span><br><span>+++ b/doc/examples/4g_srsLTE/suites/4g/ping.py</span><br><span>@@ -16,7 +16,7 @@</span><br><span> </span><br><span> ue.connect(enb)</span><br><span> print('waiting for UE to attach...')</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ue.is_connected, None)</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ue.is_registered, None)</span><br><span> print('UE is attached')</span><br><span> </span><br><span> proc = ue.run_netns_wait('ping', ('ping', '-c', '10', epc.tun_addr()))</span><br><span>diff --git a/src/osmo_gsm_tester/obj/ms_ofono.py b/src/osmo_gsm_tester/obj/ms_ofono.py</span><br><span>index e03427e..cec6824 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms_ofono.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_ofono.py</span><br><span>@@ -519,10 +519,6 @@</span><br><span> return True</span><br><span> return False</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def is_connected(self, mcc_mnc=None):</span><br><span style="color: hsl(0, 100%, 40%);">- '''Convenience helper to keep old test API'''</span><br><span style="color: hsl(0, 100%, 40%);">- return self.is_registered(mcc_mnc)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> def schedule_scan_register(self, mcc_mnc):</span><br><span> if self.register_attempts > NETREG_MAX_REGISTER_ATTEMPTS:</span><br><span> raise log.Error('Failed to find Network Operator', mcc_mnc=mcc_mnc, attempts=self.register_attempts)</span><br><span>@@ -547,7 +543,7 @@</span><br><span> # So far the easiest seems to check if we are now registered and</span><br><span> # otherwise schedule a scan again.</span><br><span> self.err('Scan() failed, retrying if needed:', e)</span><br><span style="color: hsl(0, 100%, 40%);">- if not self.is_connected(mcc_mnc):</span><br><span style="color: hsl(120, 100%, 40%);">+ if not self.is_registered(mcc_mnc):</span><br><span> self.schedule_scan_register(mcc_mnc)</span><br><span> else:</span><br><span> self.log('Already registered with network', mcc_mnc)</span><br><span>@@ -632,7 +628,7 @@</span><br><span> self.cancel_pending_dbus_methods()</span><br><span> self.power_cycle()</span><br><span> self.register_attempts = 0</span><br><span style="color: hsl(0, 100%, 40%);">- if self.is_connected(mcc_mnc):</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.is_registered(mcc_mnc):</span><br><span> self.log('Already registered with', mcc_mnc if mcc_mnc else 'default network')</span><br><span> else:</span><br><span> self.log('Connect to', mcc_mnc if mcc_mnc else 'default network')</span><br><span>diff --git a/sysmocom/suites/debug/interactive.py b/sysmocom/suites/debug/interactive.py</span><br><span>index fa53cc8..3b6a338 100755</span><br><span>--- a/sysmocom/suites/debug/interactive.py</span><br><span>+++ b/sysmocom/suites/debug/interactive.py</span><br><span>@@ -54,7 +54,7 @@</span><br><span> elif 'wait-registered'.startswith(cmd):</span><br><span> try:</span><br><span> for m in modems:</span><br><span style="color: hsl(0, 100%, 40%);">- wait(m.is_connected, msc.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+ wait(m.is_registered, msc.mcc_mnc())</span><br><span> wait(msc.subscriber_attached, *modems)</span><br><span> except Timeout:</span><br><span> print('Timeout while waiting for registration.')</span><br><span>diff --git a/sysmocom/suites/dynts/switch_tch_pdch.py b/sysmocom/suites/dynts/switch_tch_pdch.py</span><br><span>index 7be4be7..26c108e 100755</span><br><span>--- a/sysmocom/suites/dynts/switch_tch_pdch.py</span><br><span>+++ b/sysmocom/suites/dynts/switch_tch_pdch.py</span><br><span>@@ -76,8 +76,8 @@</span><br><span> ms_mt.log_info()</span><br><span> </span><br><span> print('waiting for modems to attach...')</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ms_mo.is_connected, msc.mcc_mnc())</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ms_mt.is_connected, msc.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ms_mo.is_registered, msc.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ms_mt.is_registered, msc.mcc_mnc())</span><br><span> wait(msc.subscriber_attached, ms_mo)</span><br><span> wait(msc.subscriber_attached, ms_mt)</span><br><span> </span><br><span>diff --git a/sysmocom/suites/encryption/lib/testlib.py b/sysmocom/suites/encryption/lib/testlib.py</span><br><span>index ed76e6f..87581c6 100644</span><br><span>--- a/sysmocom/suites/encryption/lib/testlib.py</span><br><span>+++ b/sysmocom/suites/encryption/lib/testlib.py</span><br><span>@@ -39,7 +39,7 @@</span><br><span> sleep(40) # TODO: read pcap or CTRL interface and look for Rejected? (gsm_a.dtap.msg_mm_type == 0x04)</span><br><span> print('Asserting modem did not register')</span><br><span> # FIXME: this can fail because ofono qmi signals registered before being accepted by network. See OS#2458</span><br><span style="color: hsl(0, 100%, 40%);">- # assert not ms.is_connected(msc.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+ # assert not ms.is_registered(msc.mcc_mnc())</span><br><span> assert not msc.subscriber_attached(ms)</span><br><span> </span><br><span> hlr.subscriber_delete(ms)</span><br><span>@@ -50,5 +50,5 @@</span><br><span> else:</span><br><span> print('Attempt connection with wrong KI, should work as it is not used...')</span><br><span> ms.connect(msc.mcc_mnc())</span><br><span style="color: hsl(0, 100%, 40%);">- wait(ms.is_connected, msc.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+ wait(ms.is_registered, msc.mcc_mnc())</span><br><span> wait(msc.subscriber_attached, ms)</span><br><span>diff --git a/sysmocom/suites/gprs/lib/testlib.py b/sysmocom/suites/gprs/lib/testlib.py</span><br><span>index 1421229..510dc72 100644</span><br><span>--- a/sysmocom/suites/gprs/lib/testlib.py</span><br><span>+++ b/sysmocom/suites/gprs/lib/testlib.py</span><br><span>@@ -85,7 +85,7 @@</span><br><span> </span><br><span> print('waiting for modems to attach...')</span><br><span> for ms in ms_li:</span><br><span style="color: hsl(0, 100%, 40%);">- wait(ms.is_connected, msc.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+ wait(ms.is_registered, msc.mcc_mnc())</span><br><span> wait(msc.subscriber_attached, *ms_li)</span><br><span> </span><br><span> print('waiting for modems to attach to data services...')</span><br><span>diff --git a/sysmocom/suites/gprs/ping.py b/sysmocom/suites/gprs/ping.py</span><br><span>index 9a7acde..421aa26 100755</span><br><span>--- a/sysmocom/suites/gprs/ping.py</span><br><span>+++ b/sysmocom/suites/gprs/ping.py</span><br><span>@@ -40,7 +40,7 @@</span><br><span> ms.log_info()</span><br><span> </span><br><span> print('waiting for modems to attach...')</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ms.is_connected, msc.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ms.is_registered, msc.mcc_mnc())</span><br><span> wait(msc.subscriber_attached, ms)</span><br><span> </span><br><span> print('waiting for modems to attach to data services...')</span><br><span>diff --git a/sysmocom/suites/gprs/ping_idle_ping.py b/sysmocom/suites/gprs/ping_idle_ping.py</span><br><span>index 88ecbdb..099650c 100755</span><br><span>--- a/sysmocom/suites/gprs/ping_idle_ping.py</span><br><span>+++ b/sysmocom/suites/gprs/ping_idle_ping.py</span><br><span>@@ -45,7 +45,7 @@</span><br><span> ms.log_info()</span><br><span> </span><br><span> print('waiting for modems to attach...')</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ms.is_connected, msc.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ms.is_registered, msc.mcc_mnc())</span><br><span> wait(msc.subscriber_attached, ms)</span><br><span> </span><br><span> print('waiting for modems to attach to data services...')</span><br><span>diff --git a/sysmocom/suites/nitb_debug/interactive.py b/sysmocom/suites/nitb_debug/interactive.py</span><br><span>index bd68a57..21f4175 100755</span><br><span>--- a/sysmocom/suites/nitb_debug/interactive.py</span><br><span>+++ b/sysmocom/suites/nitb_debug/interactive.py</span><br><span>@@ -31,7 +31,7 @@</span><br><span> elif 'wait-registered'.startswith(cmd):</span><br><span> try:</span><br><span> for m in modems:</span><br><span style="color: hsl(0, 100%, 40%);">- wait(m.is_connected, nitb.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+ wait(m.is_registered, nitb.mcc_mnc())</span><br><span> wait(nitb.subscriber_attached, *modems)</span><br><span> except Timeout:</span><br><span> print('Timeout while waiting for registration.')</span><br><span>diff --git a/sysmocom/suites/nitb_netreg/register.py b/sysmocom/suites/nitb_netreg/register.py</span><br><span>index fd171b3..4977f66 100755</span><br><span>--- a/sysmocom/suites/nitb_netreg/register.py</span><br><span>+++ b/sysmocom/suites/nitb_netreg/register.py</span><br><span>@@ -18,5 +18,5 @@</span><br><span> </span><br><span> print(ms.info())</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-wait(ms.is_connected, nitb.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ms.is_registered, nitb.mcc_mnc())</span><br><span> wait(nitb.subscriber_attached, ms)</span><br><span>diff --git a/sysmocom/suites/nitb_netreg/register_default.py b/sysmocom/suites/nitb_netreg/register_default.py</span><br><span>index 6531049..67299fe 100755</span><br><span>--- a/sysmocom/suites/nitb_netreg/register_default.py</span><br><span>+++ b/sysmocom/suites/nitb_netreg/register_default.py</span><br><span>@@ -18,5 +18,5 @@</span><br><span> </span><br><span> print(ms.info())</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-wait(ms.is_connected)</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ms.is_registered)</span><br><span> wait(nitb.subscriber_attached, ms)</span><br><span>diff --git a/sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py b/sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py</span><br><span>index 29a5ced..f9617e2 100755</span><br><span>--- a/sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py</span><br><span>+++ b/sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py</span><br><span>@@ -38,7 +38,7 @@</span><br><span> </span><br><span> print('MS registers and will receive the SMS...')</span><br><span> ms.connect(nitb.mcc_mnc())</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ms.is_connected, nitb.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ms.is_registered, nitb.mcc_mnc())</span><br><span> wait(nitb.subscriber_attached, ms)</span><br><span> wait(ms.sms_was_received, msg)</span><br><span> print('Waiting to receive and consume sms receipt with reference', umref)</span><br><span>diff --git a/sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py b/sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py</span><br><span>index 2963b6e..ade8054 100755</span><br><span>--- a/sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py</span><br><span>+++ b/sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py</span><br><span>@@ -28,7 +28,7 @@</span><br><span> </span><br><span> ms.log_info()</span><br><span> print('waiting for modem to attach...')</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ms.is_connected, nitb.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ms.is_registered, nitb.mcc_mnc())</span><br><span> wait(nitb.subscriber_attached, ms)</span><br><span> </span><br><span> print('sending first sms...')</span><br><span>diff --git a/sysmocom/suites/nitb_sms/mo_mt_sms.py b/sysmocom/suites/nitb_sms/mo_mt_sms.py</span><br><span>index d1cece6..0f2ebfc 100755</span><br><span>--- a/sysmocom/suites/nitb_sms/mo_mt_sms.py</span><br><span>+++ b/sysmocom/suites/nitb_sms/mo_mt_sms.py</span><br><span>@@ -22,8 +22,8 @@</span><br><span> ms_mt.log_info()</span><br><span> </span><br><span> print('waiting for modems to attach...')</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ms_mo.is_connected, nitb.mcc_mnc())</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ms_mt.is_connected, nitb.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ms_mo.is_registered, nitb.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ms_mt.is_registered, nitb.mcc_mnc())</span><br><span> wait(nitb.subscriber_attached, ms_mo, ms_mt)</span><br><span> </span><br><span> sms = ms_mo.sms_send(ms_mt)</span><br><span>diff --git a/sysmocom/suites/nitb_ussd/assert_extension.py b/sysmocom/suites/nitb_ussd/assert_extension.py</span><br><span>index 6246e61..e547131 100755</span><br><span>--- a/sysmocom/suites/nitb_ussd/assert_extension.py</span><br><span>+++ b/sysmocom/suites/nitb_ussd/assert_extension.py</span><br><span>@@ -19,7 +19,7 @@</span><br><span> ms.log_info()</span><br><span> </span><br><span> print('waiting for modems to attach...')</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ms.is_connected, nitb.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ms.is_registered, nitb.mcc_mnc())</span><br><span> wait(nitb.subscriber_attached, ms)</span><br><span> </span><br><span> # ofono (qmi) currently changes state to 'registered' jut after sending</span><br><span>diff --git a/sysmocom/suites/smpp/esme_ms_sms_storeforward.py b/sysmocom/suites/smpp/esme_ms_sms_storeforward.py</span><br><span>index 232d1d3..6ec414b 100755</span><br><span>--- a/sysmocom/suites/smpp/esme_ms_sms_storeforward.py</span><br><span>+++ b/sysmocom/suites/smpp/esme_ms_sms_storeforward.py</span><br><span>@@ -50,7 +50,7 @@</span><br><span> </span><br><span> print('MS registers and will receive the SMS...')</span><br><span> ms.connect(msc.mcc_mnc())</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ms.is_connected, msc.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ms.is_registered, msc.mcc_mnc())</span><br><span> wait(msc.subscriber_attached, ms)</span><br><span> wait(ms.sms_was_received, msg)</span><br><span> print('Waiting to receive and consume sms receipt with reference', umref)</span><br><span>diff --git a/sysmocom/suites/smpp/esme_ms_sms_transaction.py b/sysmocom/suites/smpp/esme_ms_sms_transaction.py</span><br><span>index d42012b..5a5a470 100755</span><br><span>--- a/sysmocom/suites/smpp/esme_ms_sms_transaction.py</span><br><span>+++ b/sysmocom/suites/smpp/esme_ms_sms_transaction.py</span><br><span>@@ -38,7 +38,7 @@</span><br><span> </span><br><span> ms.log_info()</span><br><span> print('waiting for modem to attach...')</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ms.is_connected, msc.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ms.is_registered, msc.mcc_mnc())</span><br><span> wait(msc.subscriber_attached, ms)</span><br><span> </span><br><span> print('sending first sms...')</span><br><span>diff --git a/sysmocom/suites/sms/mo_mt_sms.py b/sysmocom/suites/sms/mo_mt_sms.py</span><br><span>index 51e78c0..d7606e4 100755</span><br><span>--- a/sysmocom/suites/sms/mo_mt_sms.py</span><br><span>+++ b/sysmocom/suites/sms/mo_mt_sms.py</span><br><span>@@ -33,8 +33,8 @@</span><br><span> ms_mt.log_info()</span><br><span> </span><br><span> print('waiting for modems to attach...')</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ms_mo.is_connected, msc.mcc_mnc())</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ms_mt.is_connected, msc.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ms_mo.is_registered, msc.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ms_mt.is_registered, msc.mcc_mnc())</span><br><span> wait(msc.subscriber_attached, ms_mo, ms_mt)</span><br><span> </span><br><span> sms = ms_mo.sms_send(ms_mt)</span><br><span>diff --git a/sysmocom/suites/ussd/assert_extension.py b/sysmocom/suites/ussd/assert_extension.py</span><br><span>index bac311f..87f2ee5 100755</span><br><span>--- a/sysmocom/suites/ussd/assert_extension.py</span><br><span>+++ b/sysmocom/suites/ussd/assert_extension.py</span><br><span>@@ -31,7 +31,7 @@</span><br><span> ms.log_info()</span><br><span> </span><br><span> print('waiting for modems to attach...')</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ms.is_connected, msc.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ms.is_registered, msc.mcc_mnc())</span><br><span> wait(msc.subscriber_attached, ms)</span><br><span> </span><br><span> # ofono (qmi) currently changes state to 'registered' jut after sending</span><br><span>diff --git a/sysmocom/suites/voice/lib/testlib.py b/sysmocom/suites/voice/lib/testlib.py</span><br><span>index 3ec6d67..83a6de4 100644</span><br><span>--- a/sysmocom/suites/voice/lib/testlib.py</span><br><span>+++ b/sysmocom/suites/voice/lib/testlib.py</span><br><span>@@ -45,8 +45,8 @@</span><br><span> ms_mt.log_info()</span><br><span> </span><br><span> print('waiting for modems to attach...')</span><br><span style="color: hsl(0, 100%, 40%);">- wait(ms_mo.is_connected, msc.mcc_mnc())</span><br><span style="color: hsl(0, 100%, 40%);">- wait(ms_mt.is_connected, msc.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+ wait(ms_mo.is_registered, msc.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+ wait(ms_mt.is_registered, msc.mcc_mnc())</span><br><span> wait(msc.subscriber_attached, ms_mo, ms_mt)</span><br><span> </span><br><span> assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18756">change 18756</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18756"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ic91dddcfd1a5a17c35d15a8a14628b3923229523 </div>
<div style="display:none"> Gerrit-Change-Number: 18756 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>