From 852264755501618f4291032c39a9b00b1dd147ee Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Tue, 16 May 2023 12:27:02 +0200 Subject: [PATCH] Run the Layout 2020 tests in main workflow Also fix report_aggregated_expected_results.py which was reporting an error when there were no failing tests. This is more commonly an issue with Layout 2020 because if runs fewer tests and was causing builds to show up as failing even when they were not. --- .github/workflows/main.yml | 1 + etc/ci/report_aggregated_expected_results.py | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 786a9943cf6..e7bc52cc50c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -59,6 +59,7 @@ jobs: uses: ./.github/workflows/linux.yml with: layout: '2020' + wpt: 'test' build_result: name: homu build finished diff --git a/etc/ci/report_aggregated_expected_results.py b/etc/ci/report_aggregated_expected_results.py index 95ed83cd6e1..177e9266bd6 100755 --- a/etc/ci/report_aggregated_expected_results.py +++ b/etc/ci/report_aggregated_expected_results.py @@ -105,8 +105,11 @@ class Item: def get_results(filenames: list[str], tag: str = "") -> Optional[Item]: unexpected = [] for filename in filenames: - with open(filename, encoding="utf-8") as file: - unexpected += json.load(file) + try: + with open(filename, encoding="utf-8") as file: + unexpected += json.load(file) + except FileNotFoundError as exception: + print(exception) unexpected.sort(key=lambda result: result["path"]) def is_flaky(result):