Skip to content

Commit 274f8b9

Browse files
author
Cruz Monrreal
authored
Merge pull request #8588 from mprse/ice_tea_test_order_fix
Fix Ice Tea test execution order to be sorted by names.
2 parents b1904a5 + de24a95 commit 274f8b9

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

tools/run_icetea.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import os
2020
import re
2121
from os.path import abspath, join, dirname, relpath, sep
22-
import json
22+
import json, operator
2323
import traceback
2424
from fnmatch import translate
2525
from argparse import ArgumentParser
@@ -173,13 +173,16 @@ def icetea_tests(target, tcdir, verbose):
173173
+ (['-v'] if verbose else [])
174174

175175
stdout, stderr, returncode = run_cmd(command)
176-
176+
177+
list_json = json.loads(stdout)
178+
list_json.sort(key=operator.itemgetter('name'))
179+
177180
if returncode != 0:
178181
additional_information = "\ncwd:{} \nCommand:'{}' \noutput:{}".format(os.getcwd(), ' '.join(command),
179182
stderr.decode())
180183
raise Exception("Error when running icetea. {}".format(additional_information))
181184

182-
return json.loads(stdout)
185+
return list_json
183186

184187

185188
def is_test_in_test_by_name(test_name, test_by_name):

0 commit comments

Comments
 (0)