[MERGED] osmo-gsm-manuals[master]: OsmoGsmTester: Update sample test script

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged.

Change subject: OsmoGsmTester: Update sample test script
......................................................................


OsmoGsmTester: Update sample test script

Copied from newest mo_mt_sms.py test.

Change-Id: I49644f6f8223d45bccbcbb3aa8325c20c06dcdbe
---
M OsmoGSMTester/chapters/intro.adoc
1 file changed, 8 insertions(+), 7 deletions(-)

Approvals:
  Neels Hofmeyr: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/OsmoGSMTester/chapters/intro.adoc b/OsmoGSMTester/chapters/intro.adoc
index 8a09910..50b6dff 100644
--- a/OsmoGSMTester/chapters/intro.adoc
+++ b/OsmoGSMTester/chapters/intro.adoc
@@ -161,7 +161,6 @@
 #!/usr/bin/env python3
 from osmo_gsm_tester.test import *
 
-print('use resources...')
 nitb = suite.nitb()
 bts = suite.bts()
 ms_mo = suite.modem()
@@ -170,19 +169,21 @@
 print('start nitb and bts...')
 nitb.bts_add(bts)
 nitb.start()
-sleep(1)
-assert nitb.running()
 bts.start()
 
 nitb.subscriber_add(ms_mo)
 nitb.subscriber_add(ms_mt)
 
-ms_mo.connect(nitb)
-ms_mt.connect(nitb)
+ms_mo.connect(nitb.mcc_mnc())
+ms_mt.connect(nitb.mcc_mnc())
+
+print('waiting for modems to attach...')
+wait(ms_mo.is_connected, nitb.mcc_mnc())
+wait(ms_mt.is_connected, nitb.mcc_mnc())
 wait(nitb.subscriber_attached, ms_mo, ms_mt)
 
-sms = ms_mo.sms_send(ms_mt.msisdn)
-wait(ms_mt.sms_received, sms)
+sms = ms_mo.sms_send(ms_mt)
+wait(ms_mt.sms_was_received, sms)
 ----
 
 === Resource Resolution

-- 
To view, visit https://gerrit.osmocom.org/2917
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I49644f6f8223d45bccbcbb3aa8325c20c06dcdbe
Gerrit-PatchSet: 2
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>