<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18793">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Remove all references to defaults: timeout: from suite.conf<br><br>This feature is not really implemented and maybe never was. In any case,<br>it makes sense to have that working per-test so we can specify different<br>values per test in case it's needed.<br><br>Change-Id: I3c1b95c10e974da87ec9abd25578d8bcc0bc55a3<br>---<br>M doc/examples/4g_srsLTE/suites/4g/suite.conf<br>M doc/manuals/chapters/config.adoc<br>M selftest/suite_test/suite_test.ok<br>M selftest/suite_test/suitedirA/test_suite/suite.conf<br>M selftest/suite_test/suitedirB/suiteB/suite.conf<br>M selftest/suite_test/suitedirB/suiteC/suite.conf<br>M src/osmo_gsm_tester/core/schema.py<br>M sysmocom/suites/4g/suite.conf<br>M sysmocom/suites/encryption/suite.conf<br>M sysmocom/suites/nitb_debug/suite.conf<br>M sysmocom/suites/nitb_netreg/suite.conf<br>M sysmocom/suites/nitb_netreg_mass/suite.conf<br>M sysmocom/suites/nitb_smpp/suite.conf<br>M sysmocom/suites/nitb_sms/suite.conf<br>M sysmocom/suites/nitb_ussd/suite.conf<br>M sysmocom/suites/smpp/suite.conf<br>16 files changed, 1 insertion(+), 35 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/examples/4g_srsLTE/suites/4g/suite.conf b/doc/examples/4g_srsLTE/suites/4g/suite.conf</span><br><span>index e439e99..0b0177a 100644</span><br><span>--- a/doc/examples/4g_srsLTE/suites/4g/suite.conf</span><br><span>+++ b/doc/examples/4g_srsLTE/suites/4g/suite.conf</span><br><span>@@ -8,5 +8,3 @@</span><br><span> features:</span><br><span> - 4g</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-defaults:</span><br><span style="color: hsl(0, 100%, 40%);">- timeout: 180s</span><br><span>diff --git a/doc/manuals/chapters/config.adoc b/doc/manuals/chapters/config.adoc</span><br><span>index b4e4a95..118f056 100644</span><br><span>--- a/doc/manuals/chapters/config.adoc</span><br><span>+++ b/doc/manuals/chapters/config.adoc</span><br><span>@@ -190,9 +190,6 @@</span><br><span> a_suite_test_foo:</span><br><span> one_test_parameter_for_test_foo: 'str'</span><br><span> another_test_parameter_for_test_foo: ['bool_str']</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-defaults:</span><br><span style="color: hsl(0, 100%, 40%);">- timeout: 50s</span><br><span> ----</span><br><span> </span><br><span> [[scenarios_dir]]</span><br><span>@@ -647,9 +644,6 @@</span><br><span> <<defaults_conf,defaults.conf>> file. Content in this section follows the</span><br><span> <<schema_config,config>> schema.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-//TODO: defaults.timeout should be change in code to be config.test_timeout or similar</span><br><span style="color: hsl(0, 100%, 40%);">-//TODO: 'config' should be split into its own schema and validate defaults.conf</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> === Example Setup</span><br><span> </span><br><span> {app-name} comes with an example official setup which is the one used to run</span><br><span>diff --git a/selftest/suite_test/suite_test.ok b/selftest/suite_test/suite_test.ok</span><br><span>index 9c9f5cc..3264fe2 100644</span><br><span>--- a/selftest/suite_test/suite_test.ok</span><br><span>+++ b/selftest/suite_test/suite_test.ok</span><br><span>@@ -15,8 +15,6 @@</span><br><span> 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]</span><br><span> - valid suite dir</span><br><span> cnf test_suite: DBG: reading suite.conf</span><br><span style="color: hsl(0, 100%, 40%);">-defaults:</span><br><span style="color: hsl(0, 100%, 40%);">- timeout: 60s</span><br><span> resources:</span><br><span> bts:</span><br><span> - label: sysmoCell 5000</span><br><span>diff --git a/selftest/suite_test/suitedirA/test_suite/suite.conf b/selftest/suite_test/suitedirA/test_suite/suite.conf</span><br><span>index 4b70be8..ff4899a 100644</span><br><span>--- a/selftest/suite_test/suitedirA/test_suite/suite.conf</span><br><span>+++ b/selftest/suite_test/suitedirA/test_suite/suite.conf</span><br><span>@@ -15,5 +15,3 @@</span><br><span> one_bool_parameter: 'bool_str'</span><br><span> second_list_parameter: ['uint']</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-defaults:</span><br><span style="color: hsl(0, 100%, 40%);">- timeout: 60s</span><br><span>diff --git a/selftest/suite_test/suitedirB/suiteB/suite.conf b/selftest/suite_test/suitedirB/suiteB/suite.conf</span><br><span>index 3645cd9..a4d0951 100644</span><br><span>--- a/selftest/suite_test/suitedirB/suiteB/suite.conf</span><br><span>+++ b/selftest/suite_test/suitedirB/suiteB/suite.conf</span><br><span>@@ -1,4 +1,2 @@</span><br><span> resources:</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-defaults:</span><br><span style="color: hsl(0, 100%, 40%);">- timeout: 60s</span><br><span>diff --git a/selftest/suite_test/suitedirB/suiteC/suite.conf b/selftest/suite_test/suitedirB/suiteC/suite.conf</span><br><span>index 44be3fc..33639a1 100644</span><br><span>--- a/selftest/suite_test/suitedirB/suiteC/suite.conf</span><br><span>+++ b/selftest/suite_test/suitedirB/suiteC/suite.conf</span><br><span>@@ -2,5 +2,3 @@</span><br><span> ip_address:</span><br><span> - addr: 10.42.42.2 # stp</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-defaults:</span><br><span style="color: hsl(0, 100%, 40%);">- timeout: 60s</span><br><span>diff --git a/src/osmo_gsm_tester/core/schema.py b/src/osmo_gsm_tester/core/schema.py</span><br><span>index 70b4c8c..9a346cd 100644</span><br><span>--- a/src/osmo_gsm_tester/core/schema.py</span><br><span>+++ b/src/osmo_gsm_tester/core/schema.py</span><br><span>@@ -430,7 +430,7 @@</span><br><span> global _ALL_SCHEMA</span><br><span> if _ALL_SCHEMA is None:</span><br><span> want_schema = get_want_schema()</span><br><span style="color: hsl(0, 100%, 40%);">- _ALL_SCHEMA = util.dict_add({ 'defaults.timeout': STR },</span><br><span style="color: hsl(120, 100%, 40%);">+ _ALL_SCHEMA = util.dict_add(</span><br><span> dict([('config.%s' % key, val) for key, val in _CONFIG_SCHEMA.items()]),</span><br><span> dict([('resources.%s' % key, val) for key, val in want_schema.items()]),</span><br><span> dict([('modifiers.%s' % key, val) for key, val in want_schema.items()]))</span><br><span>diff --git a/sysmocom/suites/4g/suite.conf b/sysmocom/suites/4g/suite.conf</span><br><span>index fbd81b6..49031a2 100644</span><br><span>--- a/sysmocom/suites/4g/suite.conf</span><br><span>+++ b/sysmocom/suites/4g/suite.conf</span><br><span>@@ -13,5 +13,3 @@</span><br><span> duration: 'duration'</span><br><span> threshold: 'uint'</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-defaults:</span><br><span style="color: hsl(0, 100%, 40%);">- timeout: 180s</span><br><span>diff --git a/sysmocom/suites/encryption/suite.conf b/sysmocom/suites/encryption/suite.conf</span><br><span>index 18e94a3..8820b26 100644</span><br><span>--- a/sysmocom/suites/encryption/suite.conf</span><br><span>+++ b/sysmocom/suites/encryption/suite.conf</span><br><span>@@ -12,5 +12,3 @@</span><br><span> - a5_0</span><br><span> - a5_1</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-defaults:</span><br><span style="color: hsl(0, 100%, 40%);">- timeout: 120s</span><br><span>diff --git a/sysmocom/suites/nitb_debug/suite.conf b/sysmocom/suites/nitb_debug/suite.conf</span><br><span>index adfc161..e2b7d13 100644</span><br><span>--- a/sysmocom/suites/nitb_debug/suite.conf</span><br><span>+++ b/sysmocom/suites/nitb_debug/suite.conf</span><br><span>@@ -6,5 +6,3 @@</span><br><span> modem:</span><br><span> - times: 4</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-defaults:</span><br><span style="color: hsl(0, 100%, 40%);">- timeout: 60s</span><br><span>diff --git a/sysmocom/suites/nitb_netreg/suite.conf b/sysmocom/suites/nitb_netreg/suite.conf</span><br><span>index 1bb1dbb..5f651de 100644</span><br><span>--- a/sysmocom/suites/nitb_netreg/suite.conf</span><br><span>+++ b/sysmocom/suites/nitb_netreg/suite.conf</span><br><span>@@ -6,5 +6,3 @@</span><br><span> modem:</span><br><span> - times: 1</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-defaults:</span><br><span style="color: hsl(0, 100%, 40%);">- timeout: 40s</span><br><span>diff --git a/sysmocom/suites/nitb_netreg_mass/suite.conf b/sysmocom/suites/nitb_netreg_mass/suite.conf</span><br><span>index bb1585b..90e9946 100644</span><br><span>--- a/sysmocom/suites/nitb_netreg_mass/suite.conf</span><br><span>+++ b/sysmocom/suites/nitb_netreg_mass/suite.conf</span><br><span>@@ -7,5 +7,3 @@</span><br><span> - times: 100</span><br><span> type: osmo-mobile</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-defaults:</span><br><span style="color: hsl(0, 100%, 40%);">- timeout: 50s</span><br><span>diff --git a/sysmocom/suites/nitb_smpp/suite.conf b/sysmocom/suites/nitb_smpp/suite.conf</span><br><span>index eb5dc01..77861ed 100644</span><br><span>--- a/sysmocom/suites/nitb_smpp/suite.conf</span><br><span>+++ b/sysmocom/suites/nitb_smpp/suite.conf</span><br><span>@@ -8,5 +8,3 @@</span><br><span> features:</span><br><span> - sms</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-defaults:</span><br><span style="color: hsl(0, 100%, 40%);">- timeout: 60s</span><br><span>diff --git a/sysmocom/suites/nitb_sms/suite.conf b/sysmocom/suites/nitb_sms/suite.conf</span><br><span>index 485402b..52caa3c 100644</span><br><span>--- a/sysmocom/suites/nitb_sms/suite.conf</span><br><span>+++ b/sysmocom/suites/nitb_sms/suite.conf</span><br><span>@@ -8,5 +8,3 @@</span><br><span> features:</span><br><span> - sms</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-defaults:</span><br><span style="color: hsl(0, 100%, 40%);">- timeout: 60s</span><br><span>diff --git a/sysmocom/suites/nitb_ussd/suite.conf b/sysmocom/suites/nitb_ussd/suite.conf</span><br><span>index 232a5d8..8314920 100644</span><br><span>--- a/sysmocom/suites/nitb_ussd/suite.conf</span><br><span>+++ b/sysmocom/suites/nitb_ussd/suite.conf</span><br><span>@@ -8,5 +8,3 @@</span><br><span> features:</span><br><span> - ussd</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-defaults:</span><br><span style="color: hsl(0, 100%, 40%);">- timeout: 60s</span><br><span>diff --git a/sysmocom/suites/smpp/suite.conf b/sysmocom/suites/smpp/suite.conf</span><br><span>index 61e7015..304b310 100644</span><br><span>--- a/sysmocom/suites/smpp/suite.conf</span><br><span>+++ b/sysmocom/suites/smpp/suite.conf</span><br><span>@@ -8,5 +8,3 @@</span><br><span> features:</span><br><span> - sms</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-defaults:</span><br><span style="color: hsl(0, 100%, 40%);">- timeout: 60s</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18793">change 18793</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18793"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I3c1b95c10e974da87ec9abd25578d8bcc0bc55a3 </div>
<div style="display:none"> Gerrit-Change-Number: 18793 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>