floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better handle the different matrix types

This commit is contained in:
sommersoft 2022-03-27 21:42:59 -05:00
parent d6e808d5f1
commit 0b12f28a63
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
testing/downstream_testing/downstream_runner.py
View File

@ -168,10 +168,11 @@ class DownstreamRunner:
tox_base = self.matrix_schema["tox_cmd_build"]["base"] tox_base = self.matrix_schema["tox_cmd_build"]["base"]
tox_prefix = self.matrix_schema["tox_cmd_build"]["prefix"] tox_prefix = self.matrix_schema["tox_cmd_build"]["prefix"]
skip_matrices = [] skip_matrices = []
if isinstance(parsed_matrix, dict): if "include" in self.matrix_schema["matrix"]:
for item in parsed_matrix: for item in parsed_matrix:
if (not item[tox_base].startswith(tox_prefix) or if (not item[tox_base].startswith(tox_prefix) or
item[tox_base] in self.matrix_exclude item[tox_base] in self.matrix_exclude or
not item.get("os", "").startswith("ubuntu")
): ):
skip_matrices.append(item) skip_matrices.append(item)
continue continue
@ -181,12 +182,12 @@ class DownstreamRunner:
self.matrix_schema["tox_cmd_build"]["sub"]["replace"], self.matrix_schema["tox_cmd_build"]["sub"]["replace"],
item[tox_base] item[tox_base]
) )
#logger.debug("re.sub: %s", item[tox_base]) logger.debug("re.sub: %s", item[tox_base])
for matrice in skip_matrices: for matrice in skip_matrices:
parsed_matrix.remove(matrice) parsed_matrix.remove(matrice)
elif isinstance(parsed_matrix, list): else:
new_parsed_matrix = [] new_parsed_matrix = []
for item in parsed_matrix: for item in parsed_matrix:
if str(item) in self.matrix_exclude: if str(item) in self.matrix_exclude: