From 8cfb5d020f925a40432237170e41460cab616c14 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Fri, 12 Jun 2020 16:12:40 +0200 Subject: Remove all references to defaults: timeout: from suite.conf This feature is not really implemented and maybe never was. In any case, it makes sense to have that working per-test so we can specify different values per test in case it's needed. Change-Id: I3c1b95c10e974da87ec9abd25578d8bcc0bc55a3 --- doc/examples/4g_srsLTE/suites/4g/suite.conf | 2 -- doc/manuals/chapters/config.adoc | 6 ------ selftest/suite_test/suite_test.ok | 2 -- selftest/suite_test/suitedirA/test_suite/suite.conf | 2 -- selftest/suite_test/suitedirB/suiteB/suite.conf | 2 -- selftest/suite_test/suitedirB/suiteC/suite.conf | 2 -- src/osmo_gsm_tester/core/schema.py | 2 +- sysmocom/suites/4g/suite.conf | 2 -- sysmocom/suites/encryption/suite.conf | 2 -- sysmocom/suites/nitb_debug/suite.conf | 2 -- sysmocom/suites/nitb_netreg/suite.conf | 2 -- sysmocom/suites/nitb_netreg_mass/suite.conf | 2 -- sysmocom/suites/nitb_smpp/suite.conf | 2 -- sysmocom/suites/nitb_sms/suite.conf | 2 -- sysmocom/suites/nitb_ussd/suite.conf | 2 -- sysmocom/suites/smpp/suite.conf | 2 -- 16 files changed, 1 insertion(+), 35 deletions(-) diff --git a/doc/examples/4g_srsLTE/suites/4g/suite.conf b/doc/examples/4g_srsLTE/suites/4g/suite.conf index e439e99..0b0177a 100644 --- a/doc/examples/4g_srsLTE/suites/4g/suite.conf +++ b/doc/examples/4g_srsLTE/suites/4g/suite.conf @@ -8,5 +8,3 @@ resources: features: - 4g -defaults: - timeout: 180s diff --git a/doc/manuals/chapters/config.adoc b/doc/manuals/chapters/config.adoc index b4e4a95..118f056 100644 --- a/doc/manuals/chapters/config.adoc +++ b/doc/manuals/chapters/config.adoc @@ -190,9 +190,6 @@ schema: a_suite_test_foo: one_test_parameter_for_test_foo: 'str' another_test_parameter_for_test_foo: ['bool_str'] - -defaults: - timeout: 50s ---- [[scenarios_dir]] @@ -647,9 +644,6 @@ these main element sections::: <> file. Content in this section follows the <> schema. -//TODO: defaults.timeout should be change in code to be config.test_timeout or similar -//TODO: 'config' should be split into its own schema and validate defaults.conf - === Example Setup {app-name} comes with an example official setup which is the one used to run diff --git a/selftest/suite_test/suite_test.ok b/selftest/suite_test/suite_test.ok index 9c9f5cc..3264fe2 100644 --- a/selftest/suite_test/suite_test.ok +++ b/selftest/suite_test/suite_test.ok @@ -15,8 +15,6 @@ cnf empty_dir: DBG: reading suite.conf cnf [PATH]/selftest/suite_test/suitedirA/empty_dir/suite.conf: ERR: FileNotFoundError: [Errno 2] No such file or directory: '[PATH]/selftest/suite_test/suitedirA/empty_dir/suite.conf' [empty_dir↪[PATH]/selftest/suite_test/suitedirA/empty_dir/suite.conf] - valid suite dir cnf test_suite: DBG: reading suite.conf -defaults: - timeout: 60s resources: bts: - label: sysmoCell 5000 diff --git a/selftest/suite_test/suitedirA/test_suite/suite.conf b/selftest/suite_test/suitedirA/test_suite/suite.conf index 4b70be8..ff4899a 100644 --- a/selftest/suite_test/suitedirA/test_suite/suite.conf +++ b/selftest/suite_test/suitedirA/test_suite/suite.conf @@ -15,5 +15,3 @@ schema: one_bool_parameter: 'bool_str' second_list_parameter: ['uint'] -defaults: - timeout: 60s diff --git a/selftest/suite_test/suitedirB/suiteB/suite.conf b/selftest/suite_test/suitedirB/suiteB/suite.conf index 3645cd9..a4d0951 100644 --- a/selftest/suite_test/suitedirB/suiteB/suite.conf +++ b/selftest/suite_test/suitedirB/suiteB/suite.conf @@ -1,4 +1,2 @@ resources: -defaults: - timeout: 60s diff --git a/selftest/suite_test/suitedirB/suiteC/suite.conf b/selftest/suite_test/suitedirB/suiteC/suite.conf index 44be3fc..33639a1 100644 --- a/selftest/suite_test/suitedirB/suiteC/suite.conf +++ b/selftest/suite_test/suitedirB/suiteC/suite.conf @@ -2,5 +2,3 @@ resources: ip_address: - addr: 10.42.42.2 # stp -defaults: - timeout: 60s diff --git a/src/osmo_gsm_tester/core/schema.py b/src/osmo_gsm_tester/core/schema.py index 70b4c8c..9a346cd 100644 --- a/src/osmo_gsm_tester/core/schema.py +++ b/src/osmo_gsm_tester/core/schema.py @@ -430,7 +430,7 @@ def get_all_schema(): global _ALL_SCHEMA if _ALL_SCHEMA is None: want_schema = get_want_schema() - _ALL_SCHEMA = util.dict_add({ 'defaults.timeout': STR }, + _ALL_SCHEMA = util.dict_add( dict([('config.%s' % key, val) for key, val in _CONFIG_SCHEMA.items()]), dict([('resources.%s' % key, val) for key, val in want_schema.items()]), dict([('modifiers.%s' % key, val) for key, val in want_schema.items()])) diff --git a/sysmocom/suites/4g/suite.conf b/sysmocom/suites/4g/suite.conf index fbd81b6..49031a2 100644 --- a/sysmocom/suites/4g/suite.conf +++ b/sysmocom/suites/4g/suite.conf @@ -13,5 +13,3 @@ schema: duration: 'duration' threshold: 'uint' -defaults: - timeout: 180s diff --git a/sysmocom/suites/encryption/suite.conf b/sysmocom/suites/encryption/suite.conf index 18e94a3..8820b26 100644 --- a/sysmocom/suites/encryption/suite.conf +++ b/sysmocom/suites/encryption/suite.conf @@ -12,5 +12,3 @@ resources: - a5_0 - a5_1 -defaults: - timeout: 120s diff --git a/sysmocom/suites/nitb_debug/suite.conf b/sysmocom/suites/nitb_debug/suite.conf index adfc161..e2b7d13 100644 --- a/sysmocom/suites/nitb_debug/suite.conf +++ b/sysmocom/suites/nitb_debug/suite.conf @@ -6,5 +6,3 @@ resources: modem: - times: 4 -defaults: - timeout: 60s diff --git a/sysmocom/suites/nitb_netreg/suite.conf b/sysmocom/suites/nitb_netreg/suite.conf index 1bb1dbb..5f651de 100644 --- a/sysmocom/suites/nitb_netreg/suite.conf +++ b/sysmocom/suites/nitb_netreg/suite.conf @@ -6,5 +6,3 @@ resources: modem: - times: 1 -defaults: - timeout: 40s diff --git a/sysmocom/suites/nitb_netreg_mass/suite.conf b/sysmocom/suites/nitb_netreg_mass/suite.conf index bb1585b..90e9946 100644 --- a/sysmocom/suites/nitb_netreg_mass/suite.conf +++ b/sysmocom/suites/nitb_netreg_mass/suite.conf @@ -7,5 +7,3 @@ resources: - times: 100 type: osmo-mobile -defaults: - timeout: 50s diff --git a/sysmocom/suites/nitb_smpp/suite.conf b/sysmocom/suites/nitb_smpp/suite.conf index eb5dc01..77861ed 100644 --- a/sysmocom/suites/nitb_smpp/suite.conf +++ b/sysmocom/suites/nitb_smpp/suite.conf @@ -8,5 +8,3 @@ resources: features: - sms -defaults: - timeout: 60s diff --git a/sysmocom/suites/nitb_sms/suite.conf b/sysmocom/suites/nitb_sms/suite.conf index 485402b..52caa3c 100644 --- a/sysmocom/suites/nitb_sms/suite.conf +++ b/sysmocom/suites/nitb_sms/suite.conf @@ -8,5 +8,3 @@ resources: features: - sms -defaults: - timeout: 60s diff --git a/sysmocom/suites/nitb_ussd/suite.conf b/sysmocom/suites/nitb_ussd/suite.conf index 232a5d8..8314920 100644 --- a/sysmocom/suites/nitb_ussd/suite.conf +++ b/sysmocom/suites/nitb_ussd/suite.conf @@ -8,5 +8,3 @@ resources: features: - ussd -defaults: - timeout: 60s diff --git a/sysmocom/suites/smpp/suite.conf b/sysmocom/suites/smpp/suite.conf index 61e7015..304b310 100644 --- a/sysmocom/suites/smpp/suite.conf +++ b/sysmocom/suites/smpp/suite.conf @@ -8,5 +8,3 @@ resources: features: - sms -defaults: - timeout: 60s -- cgit v1.2.3