diff options
author | Pau Espin Pedrol <pespin@sysmocom.de> | 2017-11-09 13:57:39 +0100 |
---|---|---|
committer | Your Name <you@example.com> | 2017-11-17 17:07:51 +0100 |
commit | dfe38ad2390f4ee0fd9d918005aa034a4ee774ba (patch) | |
tree | 76ea61077f454261bdd0a4a5c2e9d3acd3bf5400 | |
parent | 24c5de89c94fc8d6c80a9b9d5718b0b746799565 (diff) |
Rename test module to testenv and update references
Preparation to move current Test class into its own module test from
suite module.
Change-Id: I520bd046cb09042b5567d967f951f050e4e02e85
29 files changed, 30 insertions, 30 deletions
diff --git a/selftest/suite_test/test_suite/hello_world.py b/selftest/suite_test/test_suite/hello_world.py index 9f3bf4a..073d07f 100644 --- a/selftest/suite_test/test_suite/hello_world.py +++ b/selftest/suite_test/test_suite/hello_world.py @@ -1,4 +1,4 @@ -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * print('hello world') print('I am %r / %r' % (suite.name(), test.name())) diff --git a/selftest/suite_test/test_suite/test_error.py b/selftest/suite_test/test_suite/test_error.py index 17b05f4..c0583ff 100755 --- a/selftest/suite_test/test_suite/test_error.py +++ b/selftest/suite_test/test_suite/test_error.py @@ -1,4 +1,4 @@ -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * print('I am %r / %r' % (suite.name(), test.name())) diff --git a/selftest/suite_test/test_suite/test_fail.py b/selftest/suite_test/test_suite/test_fail.py index 6880c81..cbaeded 100755 --- a/selftest/suite_test/test_suite/test_fail.py +++ b/selftest/suite_test/test_suite/test_fail.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * print('I am %r / %r' % (suite.name(), test.name())) diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py index 1a96b1e..5b9df76 100644 --- a/src/osmo_gsm_tester/suite.py +++ b/src/osmo_gsm_tester/suite.py @@ -24,7 +24,7 @@ import traceback import pprint from . import config, log, template, util, resource, schema, event_loop from . import osmo_nitb, osmo_hlr, osmo_mgcpgw, osmo_mgw, osmo_msc, osmo_bsc, osmo_stp, modem, esme, sms -from . import test +from . import testenv class Timeout(Exception): pass @@ -89,7 +89,7 @@ class Test(log.Origin): log.large_separator(self.suite_run.trial.name(), self.suite_run.name(), self.name(), sublevel=3) self.status = Test.UNKNOWN self.start_timestamp = time.time() - test.setup(self.suite_run, self, sys.modules[__name__], event_loop, sms) + testenv.setup(self.suite_run, self, sys.modules[__name__], event_loop, sms) with self.redirect_stdout(): util.run_python_file('%s.%s' % (self.suite_run.definition.name(), self.basename), self.path) diff --git a/src/osmo_gsm_tester/test.py b/src/osmo_gsm_tester/testenv.py index b939054..26b492e 100644 --- a/src/osmo_gsm_tester/test.py +++ b/src/osmo_gsm_tester/testenv.py @@ -19,7 +19,7 @@ # These will be initialized before each test run. # A test script can thus establish its context by doing: -# from osmo_gsm_tester.test import * +# from osmo_gsm_tester.testenv import * trial = None suite = None test = None diff --git a/suites/aoip_debug/interactive.py b/suites/aoip_debug/interactive.py index cfa5d6c..98b9170 100755 --- a/suites/aoip_debug/interactive.py +++ b/suites/aoip_debug/interactive.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * hlr = suite.hlr() bts = suite.bts() mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr()) diff --git a/suites/aoip_encryption/register_a5_0_authopt.py b/suites/aoip_encryption/register_a5_0_authopt.py index 6e5e459..f528742 100755 --- a/suites/aoip_encryption/register_a5_0_authopt.py +++ b/suites/aoip_encryption/register_a5_0_authopt.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * hlr = suite.hlr() bts = suite.bts() diff --git a/suites/aoip_encryption/register_a5_0_authreq.py b/suites/aoip_encryption/register_a5_0_authreq.py index 428fc8d..a192ff3 100755 --- a/suites/aoip_encryption/register_a5_0_authreq.py +++ b/suites/aoip_encryption/register_a5_0_authreq.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * hlr = suite.hlr() bts = suite.bts() diff --git a/suites/aoip_encryption/register_a5_1_authreq.py b/suites/aoip_encryption/register_a5_1_authreq.py index 59e3fac..f5bccfb 100755 --- a/suites/aoip_encryption/register_a5_1_authreq.py +++ b/suites/aoip_encryption/register_a5_1_authreq.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * hlr = suite.hlr() bts = suite.bts() diff --git a/suites/aoip_smpp/esme_connect_policy_acceptall.py b/suites/aoip_smpp/esme_connect_policy_acceptall.py index 2a954d5..34516a3 100755 --- a/suites/aoip_smpp/esme_connect_policy_acceptall.py +++ b/suites/aoip_smpp/esme_connect_policy_acceptall.py @@ -4,7 +4,7 @@ # * SMPP interface of SMSC accepts SMPP clients (ESMEs) which do not appear on # the config file -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * hlr = suite.hlr() bts = suite.bts() # bts not started, only needed for mgcpgw diff --git a/suites/aoip_smpp/esme_connect_policy_closed.py b/suites/aoip_smpp/esme_connect_policy_closed.py index 29b25d1..79cb0c7 100755 --- a/suites/aoip_smpp/esme_connect_policy_closed.py +++ b/suites/aoip_smpp/esme_connect_policy_closed.py @@ -6,7 +6,7 @@ # * SMPP interface of SMSC rejects ESMEs with known system id but wrong password. # * SMPP interface of SMSC rejects ESEMs with unknown system id -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * SMPP_ESME_RINVPASWD = 0x0000000E SMPP_ESME_RINVSYSID = 0x0000000F diff --git a/suites/aoip_smpp/esme_ms_sms_storeforward.py b/suites/aoip_smpp/esme_ms_sms_storeforward.py index d49401f..f0d5dd5 100755 --- a/suites/aoip_smpp/esme_ms_sms_storeforward.py +++ b/suites/aoip_smpp/esme_ms_sms_storeforward.py @@ -8,7 +8,7 @@ # * When SMS is sent in 'store & forward' mode, ESME can send an SMS to an already registered MS. # * When SMS is sent in 'store & forward' mode, ESME receives a SMS receipt if it asked for it. -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * SMPP_ESME_RINVDSTADR = 0x0000000B diff --git a/suites/aoip_smpp/esme_ms_sms_transaction.py b/suites/aoip_smpp/esme_ms_sms_transaction.py index 6892a7e..2b12829 100755 --- a/suites/aoip_smpp/esme_ms_sms_transaction.py +++ b/suites/aoip_smpp/esme_ms_sms_transaction.py @@ -6,7 +6,7 @@ # * When SMS is sent in 'transaction' mode, ESME can send an SMS to an already registered MS. # * When SMS is sent in 'transaction' mode, ESME fails to send an SMS to non registered MS. -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * SMPP_ESME_RINVDSTADR = 0x0000000B diff --git a/suites/aoip_sms/mo_mt_sms.py b/suites/aoip_sms/mo_mt_sms.py index a7c1f48..12f8f2b 100755 --- a/suites/aoip_sms/mo_mt_sms.py +++ b/suites/aoip_sms/mo_mt_sms.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * hlr = suite.hlr() bts = suite.bts() diff --git a/suites/aoip_ussd/assert_extension.py b/suites/aoip_ussd/assert_extension.py index 36d6222..5204be8 100755 --- a/suites/aoip_ussd/assert_extension.py +++ b/suites/aoip_ussd/assert_extension.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * USSD_COMMAND_GET_EXTENSION = '*#100#' diff --git a/suites/debug/error.py b/suites/debug/error.py index 8e146fa..032e26c 100644 --- a/suites/debug/error.py +++ b/suites/debug/error.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * # This can be used to verify that a test error is reported properly. assert False diff --git a/suites/debug/fail.py b/suites/debug/fail.py index 8e30578..a2d9e3a 100644 --- a/suites/debug/fail.py +++ b/suites/debug/fail.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * # This can be used to verify that a test failure is reported properly. test.set_fail('ExpectedFail', 'This failure is expected') diff --git a/suites/debug/fail_raise.py b/suites/debug/fail_raise.py index 336029b..c30a4f5 100644 --- a/suites/debug/fail_raise.py +++ b/suites/debug/fail_raise.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * class ExpectedExn(Exception): pass diff --git a/suites/debug/interactive.py b/suites/debug/interactive.py index d5f7615..6df5b6d 100755 --- a/suites/debug/interactive.py +++ b/suites/debug/interactive.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * print('use resources...') nitb = suite.nitb() diff --git a/suites/debug/pass.py b/suites/debug/pass.py index 42c1f25..c07f079 100644 --- a/suites/debug/pass.py +++ b/suites/debug/pass.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * # This can be used to verify that a test passes correctly. pass diff --git a/suites/netreg/register.py b/suites/netreg/register.py index 9141986..9807d2b 100755 --- a/suites/netreg/register.py +++ b/suites/netreg/register.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * print('use resources...') nitb = suite.nitb() diff --git a/suites/netreg/register_default.py b/suites/netreg/register_default.py index d15b3f5..797b2c1 100755 --- a/suites/netreg/register_default.py +++ b/suites/netreg/register_default.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * print('use resources...') nitb = suite.nitb() diff --git a/suites/smpp/esme_connect_policy_acceptall.py b/suites/smpp/esme_connect_policy_acceptall.py index d22703d..904226b 100755 --- a/suites/smpp/esme_connect_policy_acceptall.py +++ b/suites/smpp/esme_connect_policy_acceptall.py @@ -4,7 +4,7 @@ # * SMPP interface of SMSC accepts SMPP clients (ESMEs) which do not appear on # the config file -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * nitb = suite.nitb() smsc = nitb.smsc diff --git a/suites/smpp/esme_connect_policy_closed.py b/suites/smpp/esme_connect_policy_closed.py index 7fac276..eaabb3d 100755 --- a/suites/smpp/esme_connect_policy_closed.py +++ b/suites/smpp/esme_connect_policy_closed.py @@ -6,7 +6,7 @@ # * SMPP interface of SMSC rejects ESMEs with known system id but wrong password. # * SMPP interface of SMSC rejects ESEMs with unknown system id -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * SMPP_ESME_RINVPASWD = 0x0000000E SMPP_ESME_RINVSYSID = 0x0000000F diff --git a/suites/smpp/esme_ms_sms_storeforward.py b/suites/smpp/esme_ms_sms_storeforward.py index 5ff6ad3..c35e3b1 100755 --- a/suites/smpp/esme_ms_sms_storeforward.py +++ b/suites/smpp/esme_ms_sms_storeforward.py @@ -8,7 +8,7 @@ # * When SMS is sent in 'store & forward' mode, ESME can send an SMS to an already registered MS. # * When SMS is sent in 'store & forward' mode, ESME receives a SMS receipt if it asked for it. -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * SMPP_ESME_RINVDSTADR = 0x0000000B diff --git a/suites/smpp/esme_ms_sms_transaction.py b/suites/smpp/esme_ms_sms_transaction.py index a147754..efc244c 100755 --- a/suites/smpp/esme_ms_sms_transaction.py +++ b/suites/smpp/esme_ms_sms_transaction.py @@ -6,7 +6,7 @@ # * When SMS is sent in 'transaction' mode, ESME can send an SMS to an already registered MS. # * When SMS is sent in 'transaction' mode, ESME fails to send an SMS to non registered MS. -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * SMPP_ESME_RINVDSTADR = 0x0000000B diff --git a/suites/sms/mo_mt_sms.py b/suites/sms/mo_mt_sms.py index 4e0ba08..f729f99 100755 --- a/suites/sms/mo_mt_sms.py +++ b/suites/sms/mo_mt_sms.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * nitb = suite.nitb() bts = suite.bts() diff --git a/suites/ussd/assert_extension.py b/suites/ussd/assert_extension.py index 717c58d..77e5423 100755 --- a/suites/ussd/assert_extension.py +++ b/suites/ussd/assert_extension.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * USSD_COMMAND_GET_EXTENSION = '*#100#' diff --git a/suites/voice/mo_mt_call.py b/suites/voice/mo_mt_call.py index 8cd3b23..b2d6f8d 100755 --- a/suites/voice/mo_mt_call.py +++ b/suites/voice/mo_mt_call.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from osmo_gsm_tester.test import * +from osmo_gsm_tester.testenv import * hlr = suite.hlr() bts = suite.bts() |