From d861e73f86a7c6c7482337e4194d8f9f3ce1f00e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Thu, 27 Jan 2022 18:57:48 +0100 Subject: [PATCH] Handle full unique test identifiers in testRandomOrder.py --- tests/TestScripts/testRandomOrder.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/TestScripts/testRandomOrder.py b/tests/TestScripts/testRandomOrder.py index e7d7eca1..911400dd 100755 --- a/tests/TestScripts/testRandomOrder.py +++ b/tests/TestScripts/testRandomOrder.py @@ -13,6 +13,12 @@ import sys import random import xml.etree.ElementTree as ET +def none_to_empty_str(e): + if e is None: + return "" + assert type(e) is str + return e + def list_tests(self_test_exe, tags, rng_seed): cmd = [self_test_exe, '--reporter', 'xml', '--list-tests', '--order', 'rand', '--rng-seed', str(rng_seed)] @@ -26,7 +32,9 @@ def list_tests(self_test_exe, tags, rng_seed): raise RuntimeError("Unexpected error output:\n" + process.stderr) root = ET.fromstring(stdout) - result = [elem.text for elem in root.findall('./TestCase/Name')] + result = [(none_to_empty_str(tc.find('Name').text), + none_to_empty_str(tc.find('Tags').text), + none_to_empty_str(tc.find('ClassName').text)) for tc in root.findall('./TestCase')] if len(result) < 2: raise RuntimeError("Unexpectedly few tests listed (got {})".format(