From 595cc7461f80e34a6755ac538aa774a7791cd695 Mon Sep 17 00:00:00 2001 From: Joseph Sawaya Date: Mon, 24 Mar 2025 13:05:17 -0400 Subject: [PATCH] feat: remove test_id from test_results in GQL --- ...ics__TestAnalyticsTestCase__analytics_flag_filter__0.json | 1 - ...ics__TestAnalyticsTestCase__analytics_term_filter__0.json | 1 - ...TestAnalyticsTestCase__analytics_testsuite_filter__0.json | 1 - .../analytics__TestAnalyticsTestCase__results__0.json | 5 ----- .../analytics__TestAnalyticsTestCase__results_asc__0.json | 5 ----- ...AnalyticsTestCase__results_pagination_asc_first_1__0.json | 1 - ...icsTestCase__results_pagination_asc_first_1_after__0.json | 1 - ...ase__results_pagination_asc_first_1_after_no_next__0.json | 1 - ...tAnalyticsTestCase__results_pagination_asc_last_1__0.json | 1 - ...icsTestCase__results_pagination_asc_last_1_before__0.json | 1 - ..._results_pagination_asc_last_1_before_no_previous__0.json | 1 - ...TestAnalyticsTestCase__results_pagination_first_1__0.json | 1 - ...alyticsTestCase__results_pagination_first_1_after__0.json | 1 - ...estCase__results_pagination_first_1_after_no_next__0.json | 1 - ..._TestAnalyticsTestCase__results_pagination_last_1__0.json | 1 - ...alyticsTestCase__results_pagination_last_1_before__0.json | 1 - ...ase__results_pagination_last_1_before_no_previous__0.json | 1 - graphql_api/tests/test_test_analytics.py | 4 +--- graphql_api/types/test_analytics/test_analytics.py | 2 -- utils/test_results.py | 1 - 20 files changed, 1 insertion(+), 31 deletions(-) diff --git a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__analytics_flag_filter__0.json b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__analytics_flag_filter__0.json index 405d02c5ba..7125723b64 100644 --- a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__analytics_flag_filter__0.json +++ b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__analytics_flag_filter__0.json @@ -1,7 +1,6 @@ [ { "name": "test1", - "test_id": "test_id1", "testsuite": [ "testsuite1" ], diff --git a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__analytics_term_filter__0.json b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__analytics_term_filter__0.json index 405d02c5ba..7125723b64 100644 --- a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__analytics_term_filter__0.json +++ b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__analytics_term_filter__0.json @@ -1,7 +1,6 @@ [ { "name": "test1", - "test_id": "test_id1", "testsuite": [ "testsuite1" ], diff --git a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__analytics_testsuite_filter__0.json b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__analytics_testsuite_filter__0.json index 405d02c5ba..7125723b64 100644 --- a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__analytics_testsuite_filter__0.json +++ b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__analytics_testsuite_filter__0.json @@ -1,7 +1,6 @@ [ { "name": "test1", - "test_id": "test_id1", "testsuite": [ "testsuite1" ], diff --git a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results__0.json b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results__0.json index 060e8b18f7..b9504a0cb6 100644 --- a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results__0.json +++ b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results__0.json @@ -1,7 +1,6 @@ [ { "name": "test5", - "test_id": "test_id5", "testsuite": [ "testsuite5" ], @@ -21,7 +20,6 @@ }, { "name": "test4", - "test_id": "test_id4", "testsuite": [ "testsuite4" ], @@ -41,7 +39,6 @@ }, { "name": "test3", - "test_id": "test_id3", "testsuite": [ "testsuite3" ], @@ -61,7 +58,6 @@ }, { "name": "test2", - "test_id": "test_id2", "testsuite": [ "testsuite2" ], @@ -81,7 +77,6 @@ }, { "name": "test1", - "test_id": "test_id1", "testsuite": [ "testsuite1" ], diff --git a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_asc__0.json b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_asc__0.json index 03a0a09e77..71413d9177 100644 --- a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_asc__0.json +++ b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_asc__0.json @@ -1,7 +1,6 @@ [ { "name": "test1", - "test_id": "test_id1", "testsuite": [ "testsuite1" ], @@ -21,7 +20,6 @@ }, { "name": "test2", - "test_id": "test_id2", "testsuite": [ "testsuite2" ], @@ -41,7 +39,6 @@ }, { "name": "test3", - "test_id": "test_id3", "testsuite": [ "testsuite3" ], @@ -61,7 +58,6 @@ }, { "name": "test4", - "test_id": "test_id4", "testsuite": [ "testsuite4" ], @@ -81,7 +77,6 @@ }, { "name": "test5", - "test_id": "test_id5", "testsuite": [ "testsuite5" ], diff --git a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_asc_first_1__0.json b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_asc_first_1__0.json index 405d02c5ba..7125723b64 100644 --- a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_asc_first_1__0.json +++ b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_asc_first_1__0.json @@ -1,7 +1,6 @@ [ { "name": "test1", - "test_id": "test_id1", "testsuite": [ "testsuite1" ], diff --git a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_asc_first_1_after__0.json b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_asc_first_1_after__0.json index 320eb11525..7f325cfb41 100644 --- a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_asc_first_1_after__0.json +++ b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_asc_first_1_after__0.json @@ -1,7 +1,6 @@ [ { "name": "test2", - "test_id": "test_id2", "testsuite": [ "testsuite2" ], diff --git a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_asc_first_1_after_no_next__0.json b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_asc_first_1_after_no_next__0.json index d036dd4833..4205c87efc 100644 --- a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_asc_first_1_after_no_next__0.json +++ b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_asc_first_1_after_no_next__0.json @@ -1,7 +1,6 @@ [ { "name": "test5", - "test_id": "test_id5", "testsuite": [ "testsuite5" ], diff --git a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_asc_last_1__0.json b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_asc_last_1__0.json index d036dd4833..4205c87efc 100644 --- a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_asc_last_1__0.json +++ b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_asc_last_1__0.json @@ -1,7 +1,6 @@ [ { "name": "test5", - "test_id": "test_id5", "testsuite": [ "testsuite5" ], diff --git a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_asc_last_1_before__0.json b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_asc_last_1_before__0.json index 453531007c..f40128b02a 100644 --- a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_asc_last_1_before__0.json +++ b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_asc_last_1_before__0.json @@ -1,7 +1,6 @@ [ { "name": "test4", - "test_id": "test_id4", "testsuite": [ "testsuite4" ], diff --git a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_asc_last_1_before_no_previous__0.json b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_asc_last_1_before_no_previous__0.json index 405d02c5ba..7125723b64 100644 --- a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_asc_last_1_before_no_previous__0.json +++ b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_asc_last_1_before_no_previous__0.json @@ -1,7 +1,6 @@ [ { "name": "test1", - "test_id": "test_id1", "testsuite": [ "testsuite1" ], diff --git a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_first_1__0.json b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_first_1__0.json index d036dd4833..4205c87efc 100644 --- a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_first_1__0.json +++ b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_first_1__0.json @@ -1,7 +1,6 @@ [ { "name": "test5", - "test_id": "test_id5", "testsuite": [ "testsuite5" ], diff --git a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_first_1_after__0.json b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_first_1_after__0.json index 453531007c..f40128b02a 100644 --- a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_first_1_after__0.json +++ b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_first_1_after__0.json @@ -1,7 +1,6 @@ [ { "name": "test4", - "test_id": "test_id4", "testsuite": [ "testsuite4" ], diff --git a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_first_1_after_no_next__0.json b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_first_1_after_no_next__0.json index 405d02c5ba..7125723b64 100644 --- a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_first_1_after_no_next__0.json +++ b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_first_1_after_no_next__0.json @@ -1,7 +1,6 @@ [ { "name": "test1", - "test_id": "test_id1", "testsuite": [ "testsuite1" ], diff --git a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_last_1__0.json b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_last_1__0.json index 405d02c5ba..7125723b64 100644 --- a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_last_1__0.json +++ b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_last_1__0.json @@ -1,7 +1,6 @@ [ { "name": "test1", - "test_id": "test_id1", "testsuite": [ "testsuite1" ], diff --git a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_last_1_before__0.json b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_last_1_before__0.json index 320eb11525..7f325cfb41 100644 --- a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_last_1_before__0.json +++ b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_last_1_before__0.json @@ -1,7 +1,6 @@ [ { "name": "test2", - "test_id": "test_id2", "testsuite": [ "testsuite2" ], diff --git a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_last_1_before_no_previous__0.json b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_last_1_before_no_previous__0.json index d036dd4833..4205c87efc 100644 --- a/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_last_1_before_no_previous__0.json +++ b/graphql_api/tests/snapshots/analytics__TestAnalyticsTestCase__results_pagination_last_1_before_no_previous__0.json @@ -1,7 +1,6 @@ [ { "name": "test5", - "test_id": "test_id5", "testsuite": [ "testsuite5" ], diff --git a/graphql_api/tests/test_test_analytics.py b/graphql_api/tests/test_test_analytics.py index 2d19cb9bab..003c932d47 100644 --- a/graphql_api/tests/test_test_analytics.py +++ b/graphql_api/tests/test_test_analytics.py @@ -35,7 +35,6 @@ def __call__(self, updated_at: datetime.datetime) -> dict[str, Any]: "name": f"test{RowFactory.idx}", "testsuite": f"testsuite{RowFactory.idx}", "flags": [f"flag{RowFactory.idx}"], - "test_id": f"test_id{RowFactory.idx}", "failure_rate": 0.1, "flake_rate": 0.0, "updated_at": updated_at, @@ -102,7 +101,6 @@ def dedup(rows: list[dict]) -> list[dict]: "name": name, "testsuite": sorted({r["testsuite"] for r in group}), "flags": sorted({flag for r in group for flag in r["flags"]}), - "test_id": group[0]["test_id"], # Keep first test_id "failure_rate": sum(r["failure_rate"] * w for r, w in zip(group, weights)) / total_weight, "flake_rate": sum(r["flake_rate"] * w for r, w in zip(group, weights)) @@ -131,7 +129,7 @@ def row_to_camel_case(row: dict) -> dict: for i, part in enumerate(key.split("_")) ): value.isoformat() if key == "updated_at" else value for key, value in row.items() - if key not in ("test_id", "testsuite", "flags") + if key not in ("testsuite", "flags") } diff --git a/graphql_api/types/test_analytics/test_analytics.py b/graphql_api/types/test_analytics/test_analytics.py index 833981e9b3..28f26fd69e 100644 --- a/graphql_api/types/test_analytics/test_analytics.py +++ b/graphql_api/types/test_analytics/test_analytics.py @@ -38,7 +38,6 @@ class TestResultsRow: # the order here must match the order of the fields in the query name: str - test_id: str testsuite: str | None flags: list[str] failure_rate: float @@ -55,7 +54,6 @@ class TestResultsRow: def to_dict(self) -> dict: return { "name": self.name, - "test_id": self.test_id, "testsuite": self.testsuite, "flags": self.flags, "failure_rate": self.failure_rate, diff --git a/utils/test_results.py b/utils/test_results.py index 855d2e9f87..9c347a316c 100644 --- a/utils/test_results.py +++ b/utils/test_results.py @@ -51,7 +51,6 @@ def dedup_table(table: pl.DataFrame) -> pl.DataFrame: table = ( table.group_by("name") .agg( - pl.col("test_id").first().alias("test_id"), pl.col("testsuite").alias("testsuite"), pl.col("flags").explode().unique().alias("flags"), failure_rate_expr.fill_nan(0).alias("failure_rate"),