From 2831de5790d900c292abddbd3b347424fec37200 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Thu, 4 May 2017 16:14:26 +0200 Subject: move /example/suites to /suites /suites will be the definitive GSM tests collection where everyone should contribute. Since we're using /example on our current osmo-gsm-tester setup actually as-is, change paths.conf to point at ../suites. Change-Id: I7a4d0161d3dcb3a0c723b0b96db85dd032cc2159 --- example/paths.conf | 2 +- example/suites/sms/mo_mt_sms.py | 27 --------------------------- example/suites/sms/suite.conf | 10 ---------- suites/sms/mo_mt_sms.py | 27 +++++++++++++++++++++++++++ suites/sms/suite.conf | 10 ++++++++++ 5 files changed, 38 insertions(+), 38 deletions(-) delete mode 100755 example/suites/sms/mo_mt_sms.py delete mode 100644 example/suites/sms/suite.conf create mode 100755 suites/sms/mo_mt_sms.py create mode 100644 suites/sms/suite.conf diff --git a/example/paths.conf b/example/paths.conf index bb7316c..3458a1d 100644 --- a/example/paths.conf +++ b/example/paths.conf @@ -1,3 +1,3 @@ state_dir: './state' -suites_dir: './suites' +suites_dir: '../suites' scenarios_dir: './scenarios' diff --git a/example/suites/sms/mo_mt_sms.py b/example/suites/sms/mo_mt_sms.py deleted file mode 100755 index 7176197..0000000 --- a/example/suites/sms/mo_mt_sms.py +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env python3 -from osmo_gsm_tester.test import * - -print('use resources...') -nitb = suite.nitb() -bts = suite.bts() -ms_mo = suite.modem() -ms_mt = suite.modem() - -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) -print(ms_mo.properties()) -print(ms_mt.properties()) -wait(nitb.subscriber_attached, ms_mo, ms_mt) - -sms = ms_mo.sms_send(ms_mt.msisdn) -wait(ms_mt.sms_was_received, sms) diff --git a/example/suites/sms/suite.conf b/example/suites/sms/suite.conf deleted file mode 100644 index 4a03379..0000000 --- a/example/suites/sms/suite.conf +++ /dev/null @@ -1,10 +0,0 @@ -resources: - nitb_iface: - - times: 1 - bts: - - times: 1 - modem: - - times: 2 - -defaults: - timeout: 60s diff --git a/suites/sms/mo_mt_sms.py b/suites/sms/mo_mt_sms.py new file mode 100755 index 0000000..7176197 --- /dev/null +++ b/suites/sms/mo_mt_sms.py @@ -0,0 +1,27 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.test import * + +print('use resources...') +nitb = suite.nitb() +bts = suite.bts() +ms_mo = suite.modem() +ms_mt = suite.modem() + +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) +print(ms_mo.properties()) +print(ms_mt.properties()) +wait(nitb.subscriber_attached, ms_mo, ms_mt) + +sms = ms_mo.sms_send(ms_mt.msisdn) +wait(ms_mt.sms_was_received, sms) diff --git a/suites/sms/suite.conf b/suites/sms/suite.conf new file mode 100644 index 0000000..4a03379 --- /dev/null +++ b/suites/sms/suite.conf @@ -0,0 +1,10 @@ +resources: + nitb_iface: + - times: 1 + bts: + - times: 1 + modem: + - times: 2 + +defaults: + timeout: 60s -- cgit v1.2.3