Merge branch 'main' into tony/prometheus-metrics

Author: lvthanh03

Makefile

@@ -31,13 +31,13 @@ check-for-migration-conflicts:
 	python manage.py check_for_migration_conflicts
 
 test:
-	COVERAGE_CORE=sysmon python -m pytest --cov=./ --junitxml=junit.xml
+	COVERAGE_CORE=sysmon python -m pytest --cov=./ --junitxml=junit.xml -o junit_family=legacy
 
 test.unit:
-	COVERAGE_CORE=sysmon python -m pytest --cov=./ -m "not integration" --cov-report=xml:unit.coverage.xml --junitxml=unit.junit.xml
+	COVERAGE_CORE=sysmon python -m pytest --cov=./ -m "not integration" --cov-report=xml:unit.coverage.xml --junitxml=unit.junit.xml -o junit_family=legacy
 
 test.integration:
-	COVERAGE_CORE=sysmon python -m pytest --cov=./ -m "integration" --cov-report=xml:integration.coverage.xml --junitxml=integration.junit.xml
+	COVERAGE_CORE=sysmon python -m pytest --cov=./ -m "integration" --cov-report=xml:integration.coverage.xml --junitxml=integration.junit.xml -o junit_family=legacy
 
 lint:
 	make lint.install

graphql_api/tests/test_flake_aggregates.py

@@ -79,8 +79,8 @@ def test_fetch_test_result_total_runtime(self) -> None:
 
         assert "errors" not in result
         assert result["owner"]["repository"]["testAnalytics"]["flakeAggregates"] == {
-            "flakeRate": 0.1,
-            "flakeCount": 30,
-            "flakeRatePercentChange": -33.33333,
-            "flakeCountPercentChange": 100.0,
+            "flakeRate": 0.140625,
+            "flakeCount": 31,
+            "flakeRatePercentChange": 31.25,
+            "flakeCountPercentChange": 106.66667,
         }

graphql_api/tests/test_test_analytics.py

@@ -819,14 +819,14 @@ def test_test_results_aggregates(self) -> None:
             """testResultsAggregates { totalDuration, slowestTestsDuration, totalFails, totalSkips, totalSlowTests, totalDurationPercentChange, slowestTestsDurationPercentChange, totalFailsPercentChange, totalSkipsPercentChange, totalSlowTestsPercentChange }""",
         )
         assert res["testResultsAggregates"] == {
-            "totalDuration": 570.0,
-            "totalDurationPercentChange": -63.1068,
-            "slowestTestsDuration": 29.0,
-            "slowestTestsDurationPercentChange": -50.84746,
-            "totalFails": 10,
-            "totalFailsPercentChange": 100.0,
-            "totalSkips": 5,
-            "totalSkipsPercentChange": -50.0,
+            "totalDuration": 630.0,
+            "totalDurationPercentChange": -57.57576,
+            "slowestTestsDuration": 60.0,
+            "slowestTestsDurationPercentChange": 1.69492,
+            "totalFails": 11,
+            "totalFailsPercentChange": 175.0,
+            "totalSkips": 6,
+            "totalSkipsPercentChange": -33.33333,
             "totalSlowTests": 1,
             "totalSlowTestsPercentChange": 0.0,
         }
@@ -976,10 +976,10 @@ def test_flake_aggregates(self) -> None:
         )
 
         assert res["flakeAggregates"] == {
-            "flakeCount": 2,
-            "flakeRate": 0.125,
-            "flakeCountPercentChange": -33.33333,
-            "flakeRatePercentChange": -50.0,
+            "flakeCount": 3,
+            "flakeRate": 0.2,
+            "flakeCountPercentChange": 0.0,
+            "flakeRatePercentChange": -15.55556,
         }
 
     def test_flake_aggregates_no_history(self) -> None:
@@ -1081,9 +1081,9 @@ def test_flake_aggregates_7_days(self) -> None:
 
         assert res["flakeAggregates"] == {
             "flakeCount": 1,
-            "flakeRate": 0.125,
+            "flakeRate": 0.1111111111111111,
             "flakeCountPercentChange": -50.0,
-            "flakeRatePercentChange": -43.75,
+            "flakeRatePercentChange": -55.55556,
         }
 
     def test_test_suites(self) -> None:

graphql_api/tests/test_test_results_headers.py

@@ -53,7 +53,7 @@ def test_fetch_test_result_total_runtime(self) -> None:
             result["owner"]["repository"]["testAnalytics"]["testResultsAggregates"][
                 "totalDuration"
             ]
-            == 435.0
+            == 465.0
         )
 
     def test_fetch_test_result_slowest_tests_runtime(self) -> None:
@@ -80,7 +80,7 @@ def test_fetch_test_result_slowest_tests_runtime(self) -> None:
             result["owner"]["repository"]["testAnalytics"]["testResultsAggregates"][
                 "slowestTestsDuration"
             ]
-            == 29.0
+            == 30.0
         )
 
     def test_fetch_test_result_failed_tests(self) -> None:
@@ -107,7 +107,7 @@ def test_fetch_test_result_failed_tests(self) -> None:
             result["owner"]["repository"]["testAnalytics"]["testResultsAggregates"][
                 "totalFails"
             ]
-            == 29
+            == 30
         )
 
     def test_fetch_test_result_skipped_tests(self) -> None:
@@ -134,7 +134,7 @@ def test_fetch_test_result_skipped_tests(self) -> None:
             result["owner"]["repository"]["testAnalytics"]["testResultsAggregates"][
                 "totalSkips"
             ]
-            == 29
+            == 30
         )
 
     def test_fetch_test_result_slow_tests(self) -> None:

reports/tests/factories.py

@@ -106,7 +106,6 @@ class Meta:
     id = factory.Sequence(lambda n: f"{n}")
     name = factory.Sequence(lambda n: f"{n}")
     repository = factory.SubFactory(RepositoryFactory)
-    commits_where_fail = []
     computed_name = None
 
 

utils/test_results.py

@@ -124,6 +124,7 @@ def validate(
         "flake_rate",
         "commits_where_fail",
         "last_duration",
+        "updated_at",
     }:
         return ValidationError(f"Invalid ordering field: {ordering}")
 
@@ -175,7 +176,7 @@ def generate_base_query(
     { "join reports_test rt on rt.id = rd.test_id" if testsuites or term else ""}
 	where
         rd.repoid = %(repoid)s
-		and rd.date > current_date - interval %(interval)s
+		and rd.date >= current_date - interval %(interval)s
         { "and rd.branch = %(branch)s" if branch else ""}
         { "and rd.test_id in %(test_ids)s" if test_ids else ""}
         { "and rt.testsuite in %(testsuites)s" if testsuites else ""}
@@ -504,11 +505,11 @@ def get_test_results_aggregate_numbers(
     repo: Repository, since: dt.datetime, until: dt.datetime | None = None
 ) -> dict[str, float | int]:
     totals = DailyTestRollup.objects.filter(
-        repoid=repo.repoid, date__gt=since, branch=repo.branch
+        repoid=repo.repoid, date__gte=since, branch=repo.branch
     )
 
     if until:
-        totals = totals.filter(date__lte=until)
+        totals = totals.filter(date__lt=until)
 
     num_tests = totals.distinct("test_id").count()
 
@@ -577,14 +578,14 @@ def get_flake_aggregate_numbers(
     if until is None:
         flakes = Flake.objects.filter(
             Q(repository_id=repo.repoid)
-            & (Q(end_date__isnull=True) | Q(end_date__date__gt=since.date()))
+            & (Q(end_date__isnull=True) | Q(end_date__date__gte=since.date()))
         )
     else:
         flakes = Flake.objects.filter(
             Q(repository_id=repo.repoid)
             & (
-                Q(start_date__date__lte=until.date())
-                & (Q(end_date__date__gt=since.date()) | Q(end_date__isnull=True))
+                Q(start_date__date__lt=until.date())
+                & (Q(end_date__date__gte=since.date()) | Q(end_date__isnull=True))
             )
         )
 
@@ -594,12 +595,12 @@ def get_flake_aggregate_numbers(
 
     test_rollups = DailyTestRollup.objects.filter(
         repoid=repo.repoid,
-        date__gt=since.date(),
+        date__gte=since.date(),
         branch=repo.branch,
         test_id__in=test_ids,
     )
     if until:
-        test_rollups = test_rollups.filter(date__lte=until.date())
+        test_rollups = test_rollups.filter(date__lt=until.date())
 
     if len(test_rollups) == 0:
         return {"flake_count": 0, "flake_rate": 0}