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 --- 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 -- 4 files changed, 8 deletions(-) (limited to 'selftest') 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 -- cgit v1.2.3