From 3956161b2d551f70a28373d69b8ac36b8f1cb21a Mon Sep 17 00:00:00 2001 From: Till Faelligen Date: Tue, 5 Apr 2022 10:03:22 +0200 Subject: [PATCH] Better output & add comments --- are-we-synapse-yet.py | 6 +++--- show-expected-fail-tests.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/are-we-synapse-yet.py b/are-we-synapse-yet.py index c985a9980..8d551575f 100755 --- a/are-we-synapse-yet.py +++ b/are-we-synapse-yet.py @@ -156,7 +156,7 @@ def parse_test_line(line): # ✓ POST /register downcases capitals in usernames # ... def print_stats(header_name, gid_to_tests, gid_to_name, verbose): - ci = os.getenv("CI") + ci = os.getenv("CI") # When running from GHA, this groups the subsections subsections = [] # Registration: 100% (13/13 tests) subsection_test_names = {} # 'subsection name': ["✓ Test 1", "✓ Test 2", "× Test 3"] total_passing = 0 @@ -170,7 +170,7 @@ def print_stats(header_name, gid_to_tests, gid_to_name, verbose): for name, passing in tests.items(): if passing: group_passing += 1 - test_names_and_marks.append(f"{'✓' if passing else '×'} {name}") + test_names_and_marks.append(f"{'✅' if passing else '❌'} {name}") total_tests += group_total total_passing += group_passing @@ -187,7 +187,7 @@ def print_stats(header_name, gid_to_tests, gid_to_name, verbose): print("%s: %s (%d/%d tests)" % (header_name, pct, total_passing, total_tests)) print("-" * (len(header_name)+1)) for line in subsections: - print("%s%s" % ("::group::" if ci else "", line,)) + print("%s%s" % ("::group::" if ci and verbose else "", line,)) if verbose: for test_name_and_pass_mark in subsection_test_names[line]: print(" %s" % (test_name_and_pass_mark,)) diff --git a/show-expected-fail-tests.sh b/show-expected-fail-tests.sh index 1ca9cd217..3ed937a0f 100755 --- a/show-expected-fail-tests.sh +++ b/show-expected-fail-tests.sh @@ -89,14 +89,14 @@ if [ -n "${tests_to_add}" ] && [ -n "${already_in_whitelist}" ]; then fi if [ -n "${tests_to_add}" ]; then - echo "::error:: The following tests passed but are not present in \`$2\`. Please append them to the file:" + echo "::error::The following tests passed but are not present in \`$2\`. Please append them to the file:" echo "::group::Passing tests" echo -e "${tests_to_add}" echo "::endgroup::" fi if [ -n "${already_in_whitelist}" ]; then - echo "::warning:: Tests in the whitelist still marked as **expected fail**:" + echo "::warning::Tests in the whitelist still marked as **expected fail**:" echo "::group::Still marked as expected fail" echo -e "${already_in_whitelist}" echo "::endgroup::"