upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-17 17:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

run_wml_tests: Fix the batch-disable argument

Browse Source
This commit is contained in:
Celtic Minstrel 2021-02-27 23:59:21 -05:00 committed by Celtic Minstrel
parent 995bfef3df
commit fb5a159f6e
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
run_wml_tests
View File

@ -44,7 +44,7 @@ class TestListParser:
self.verbose = options.verbose
self.filename = options.list
def get(self):
def get(self, batcher):
status_name_re = re.compile(r"^(\d+) ([\w-]+)$")
test_list = []
for line in open(self.filename, mode="rt"):
@ -60,7 +60,7 @@ class TestListParser:
if self.verbose > 1:
print(t)
test_list.append(t)
return test_list
return batcher(test_list)
def get_output_filename(args):
for i,arg in enumerate(args):
@ -186,6 +186,12 @@ def test_batcher(test_list):
if len(expected_to_pass) > 0:
yield expected_to_pass
def test_nobatcher(test_list):
"""A generator function that provides the same API as test_batcher but
emits the tests one at a time."""
for test in test_list:
yield [test]
if __name__ == '__main__':
ap = argparse.ArgumentParser()
# The options that are mandatory to support (because they're used in the Travis script)
@ -232,11 +238,12 @@ if __name__ == '__main__':
if options.verbose > 1:
print(repr(options))
test_list = TestListParser(options).get()
batcher = test_nobatcher if options.batch_disable else test_batcher
test_list = TestListParser(options).get(batcher)
runner = WesnothRunner(options)
a_test_failed = False
for batch in [test_list] if options.batch_disable else test_batcher(test_list):
for batch in test_list:
try:
runner.run_tests(batch)
except UnexpectedTestStatusException: