Skip to content

Commit abc4a69

Browse files
author
Jinming Zhao
committed
scripts: Allow using test config and level with test_play.py script
In Twister, test config and level options are ignored when --load-test is used. To combine these with dynamic scope from test_plan.py, pass them through the script instead.
1 parent 8b2c75a commit abc4a69

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

scripts/ci/test_plan.py

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ def __repr__(self):
102102

103103
class Filters:
104104
def __init__(self, modified_files, ignore_path, alt_tags, testsuite_root,
105-
pull_request=False, platforms=[], detailed_test_id=False, quarantine_list=None, tc_roots_th=20):
105+
pull_request=False, platforms=[], detailed_test_id=False, quarantine_list=None,
106+
tc_roots_th=20, test_config=None, level=None):
106107
self.modified_files = modified_files
107108
self.testsuite_root = testsuite_root
108109
self.resolved_files = []
@@ -117,6 +118,8 @@ def __init__(self, modified_files, ignore_path, alt_tags, testsuite_root,
117118
self.tag_cfg_file = alt_tags
118119
self.quarantine_list = quarantine_list
119120
self.tc_roots_th = tc_roots_th
121+
self.test_config = test_config
122+
self.level = level
120123

121124
def process(self):
122125
self.find_modules()
@@ -147,6 +150,10 @@ def get_plan(self, options, integration=False, use_testsuite_root=True):
147150
if self.quarantine_list:
148151
for q in self.quarantine_list:
149152
cmd += ["--quarantine-list", q]
153+
if self.test_config:
154+
cmd += ["--test-config", self.test_config]
155+
if self.level:
156+
cmd += ["--level", self.level]
150157

151158
logging.info(" ".join(cmd))
152159
_ = subprocess.call(cmd)
@@ -443,6 +450,10 @@ def parse_args():
443450
"the file need to correspond to the test scenarios names as in "
444451
"corresponding tests .yaml files. These scenarios "
445452
"will be skipped with quarantine as the reason.")
453+
parser.add_argument('--test-config', default=None,
454+
help="Path to file with plans and test configurations.")
455+
parser.add_argument('--level', default=None,
456+
help="Test level to be used.")
446457

447458
# Do not include paths in names by default.
448459
parser.set_defaults(detailed_test_id=False)
@@ -472,7 +483,7 @@ def parse_args():
472483

473484
f = Filters(files, args.ignore_path, args.alt_tags, args.testsuite_root,
474485
args.pull_request, args.platform, args.detailed_test_id, args.quarantine_list,
475-
args.testcase_roots_threshold)
486+
args.testcase_roots_threshold, args.test_config, args.level)
476487
f.process()
477488

478489
# remove dupes and filtered cases

0 commit comments

Comments
 (0)