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
This commit is contained in:
parent
a9bc93da99
commit
8cfb5d020f
|
@ -8,5 +8,3 @@ resources:
|
|||
features:
|
||||
- 4g
|
||||
|
||||
defaults:
|
||||
timeout: 180s
|
||||
|
|
|
@ -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:::
|
|||
<<defaults_conf,defaults.conf>> file. Content in this section follows the
|
||||
<<schema_config,config>> 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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -15,5 +15,3 @@ schema:
|
|||
one_bool_parameter: 'bool_str'
|
||||
second_list_parameter: ['uint']
|
||||
|
||||
defaults:
|
||||
timeout: 60s
|
||||
|
|
|
@ -1,4 +1,2 @@
|
|||
resources:
|
||||
|
||||
defaults:
|
||||
timeout: 60s
|
||||
|
|
|
@ -2,5 +2,3 @@ resources:
|
|||
ip_address:
|
||||
- addr: 10.42.42.2 # stp
|
||||
|
||||
defaults:
|
||||
timeout: 60s
|
||||
|
|
|
@ -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()]))
|
||||
|
|
|
@ -13,5 +13,3 @@ schema:
|
|||
duration: 'duration'
|
||||
threshold: 'uint'
|
||||
|
||||
defaults:
|
||||
timeout: 180s
|
||||
|
|
|
@ -12,5 +12,3 @@ resources:
|
|||
- a5_0
|
||||
- a5_1
|
||||
|
||||
defaults:
|
||||
timeout: 120s
|
||||
|
|
|
@ -6,5 +6,3 @@ resources:
|
|||
modem:
|
||||
- times: 4
|
||||
|
||||
defaults:
|
||||
timeout: 60s
|
||||
|
|
|
@ -6,5 +6,3 @@ resources:
|
|||
modem:
|
||||
- times: 1
|
||||
|
||||
defaults:
|
||||
timeout: 40s
|
||||
|
|
|
@ -7,5 +7,3 @@ resources:
|
|||
- times: 100
|
||||
type: osmo-mobile
|
||||
|
||||
defaults:
|
||||
timeout: 50s
|
||||
|
|
|
@ -8,5 +8,3 @@ resources:
|
|||
features:
|
||||
- sms
|
||||
|
||||
defaults:
|
||||
timeout: 60s
|
||||
|
|
|
@ -8,5 +8,3 @@ resources:
|
|||
features:
|
||||
- sms
|
||||
|
||||
defaults:
|
||||
timeout: 60s
|
||||
|
|
|
@ -8,5 +8,3 @@ resources:
|
|||
features:
|
||||
- ussd
|
||||
|
||||
defaults:
|
||||
timeout: 60s
|
||||
|
|
|
@ -8,5 +8,3 @@ resources:
|
|||
features:
|
||||
- sms
|
||||
|
||||
defaults:
|
||||
timeout: 60s
|
||||
|
|
Loading…
Reference in New Issue