diff --git a/avocado/plugins/list.py b/avocado/plugins/list.py index da2a00517d..dace3fcbe5 100644 --- a/avocado/plugins/list.py +++ b/avocado/plugins/list.py @@ -52,7 +52,13 @@ def _prepare_matrix_for_display(matrix, verbose=False): type_label = TERM_SUPPORT.healthy_str(kind) if verbose: colored_matrix.append( - (type_label, item[1], item[2], _get_tags_as_string(item[3] or {})) + ( + type_label, + item[1], + item[2], + item[3], + _get_tags_as_string(item[4] or {}), + ) ) else: colored_matrix.append((type_label, item[1])) @@ -65,6 +71,7 @@ def _display(self, suite, matrix): header = ( TERM_SUPPORT.header_str("Type"), TERM_SUPPORT.header_str("Test"), + TERM_SUPPORT.header_str("Uri"), TERM_SUPPORT.header_str("Resolver"), TERM_SUPPORT.header_str("Tag(s)"), ) @@ -140,10 +147,16 @@ def _get_resolution_matrix(suite): if verbose: tags = runnable.tags or {} test_matrix.append( - (runnable.kind, runnable.uri, resolution.origin, tags) + ( + runnable.kind, + runnable.identifier, + runnable.uri, + resolution.origin, + tags, + ) ) else: - test_matrix.append((runnable.kind, runnable.uri)) + test_matrix.append((runnable.kind, runnable.identifier)) return test_matrix @staticmethod diff --git a/selftests/functional/resolver.py b/selftests/functional/resolver.py index b3a19bdea4..6b0eea5ee8 100644 --- a/selftests/functional/resolver.py +++ b/selftests/functional/resolver.py @@ -153,7 +153,7 @@ def test_runnable_recipe_origin(self): cmd_line = f"{AVOCADO} -V list {test_path}" result = process.run(cmd_line) self.assertIn( - b"python-unittest selftests/unit/test.py:TestClassTestUnit.test_long_name runnable-recipe\n", + b"python-unittest selftests/unit/test.py:TestClassTestUnit.test_long_name selftests/unit/test.py:TestClassTestUnit.test_long_name runnable-recipe\n", result.stdout, )