From 4c1367b300811d4f1693b5af206b749f2139a18f Mon Sep 17 00:00:00 2001 From: Daniel Szoke <7881302+szokeasaurusrex@users.noreply.github.com> Date: Mon, 28 Oct 2024 17:51:06 +0100 Subject: [PATCH 1/3] test: Disable broken RQ test in newly-released RQ 2.0 (#3708) See #3707 --- tests/integrations/rq/test_rq.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/integrations/rq/test_rq.py b/tests/integrations/rq/test_rq.py index e445b588be..0b690ca3dc 100644 --- a/tests/integrations/rq/test_rq.py +++ b/tests/integrations/rq/test_rq.py @@ -35,6 +35,7 @@ def _patch_rq_get_server_version(monkeypatch): def crashing_job(foo): + print("RUNNING CRASHING JOB") 1 / 0 @@ -254,6 +255,11 @@ def test_traces_sampler_gets_correct_values_in_sampling_context( @pytest.mark.skipif( parse_version(rq.__version__) < (1, 5), reason="At least rq-1.5 required" ) +@pytest.mark.skipif( + parse_version(rq.__version__) >= (2,), + reason="Test broke in RQ 2.0. Investigate and fix. " + "See https://github.com/getsentry/sentry-python/issues/3707.", +) def test_job_with_retries(sentry_init, capture_events): sentry_init(integrations=[RqIntegration()]) events = capture_events() From 897333bce69d18a9d356ca7748b3079c02576f45 Mon Sep 17 00:00:00 2001 From: Daniel Szoke <7881302+szokeasaurusrex@users.noreply.github.com> Date: Tue, 29 Oct 2024 09:45:29 +0100 Subject: [PATCH 2/3] test(rq): Remove accidentally-committed print (#3712) #3708 got auto-merged before I had the chance to remove this print statement. --- tests/integrations/rq/test_rq.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/integrations/rq/test_rq.py b/tests/integrations/rq/test_rq.py index 0b690ca3dc..ffd6f458e1 100644 --- a/tests/integrations/rq/test_rq.py +++ b/tests/integrations/rq/test_rq.py @@ -35,7 +35,6 @@ def _patch_rq_get_server_version(monkeypatch): def crashing_job(foo): - print("RUNNING CRASHING JOB") 1 / 0 From d48dc46823d3602ca899ecb2178cfe4b8267f89c Mon Sep 17 00:00:00 2001 From: Daniel Szoke <7881302+szokeasaurusrex@users.noreply.github.com> Date: Tue, 29 Oct 2024 10:13:05 +0100 Subject: [PATCH 3/3] ci: Clarify that only pinned tests are required (#3713) Rename the action that checks that all our pinned-version tests for our integrations are named "All pinned XXX tests passed" rather than just "All XXX tests passed." The old name was confusing because the action only checks that the pinned tests have passed. --- .github/workflows/test-integrations-ai.yml | 2 +- .github/workflows/test-integrations-aws-lambda.yml | 2 +- .github/workflows/test-integrations-cloud-computing.yml | 2 +- .github/workflows/test-integrations-common.yml | 2 +- .github/workflows/test-integrations-data-processing.yml | 2 +- .github/workflows/test-integrations-databases.yml | 2 +- .github/workflows/test-integrations-graphql.yml | 2 +- .github/workflows/test-integrations-miscellaneous.yml | 2 +- .github/workflows/test-integrations-networking.yml | 2 +- .github/workflows/test-integrations-web-frameworks-1.yml | 2 +- .github/workflows/test-integrations-web-frameworks-2.yml | 2 +- scripts/split-tox-gh-actions/templates/check_required.jinja | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test-integrations-ai.yml b/.github/workflows/test-integrations-ai.yml index 723f9c8412..24ccc77a87 100644 --- a/.github/workflows/test-integrations-ai.yml +++ b/.github/workflows/test-integrations-ai.yml @@ -165,7 +165,7 @@ jobs: files: .junitxml verbose: true check_required_tests: - name: All AI tests passed + name: All pinned AI tests passed needs: test-ai-pinned # Always run this, even if a dependent job failed if: always() diff --git a/.github/workflows/test-integrations-aws-lambda.yml b/.github/workflows/test-integrations-aws-lambda.yml index 38c838ab33..6f5ea794b8 100644 --- a/.github/workflows/test-integrations-aws-lambda.yml +++ b/.github/workflows/test-integrations-aws-lambda.yml @@ -112,7 +112,7 @@ jobs: files: .junitxml verbose: true check_required_tests: - name: All AWS Lambda tests passed + name: All pinned AWS Lambda tests passed needs: test-aws_lambda-pinned # Always run this, even if a dependent job failed if: always() diff --git a/.github/workflows/test-integrations-cloud-computing.yml b/.github/workflows/test-integrations-cloud-computing.yml index a3b7fc57ab..1f6913ea4a 100644 --- a/.github/workflows/test-integrations-cloud-computing.yml +++ b/.github/workflows/test-integrations-cloud-computing.yml @@ -157,7 +157,7 @@ jobs: files: .junitxml verbose: true check_required_tests: - name: All Cloud Computing tests passed + name: All pinned Cloud Computing tests passed needs: test-cloud_computing-pinned # Always run this, even if a dependent job failed if: always() diff --git a/.github/workflows/test-integrations-common.yml b/.github/workflows/test-integrations-common.yml index 8116b1b67c..ecffdb6f3e 100644 --- a/.github/workflows/test-integrations-common.yml +++ b/.github/workflows/test-integrations-common.yml @@ -77,7 +77,7 @@ jobs: files: .junitxml verbose: true check_required_tests: - name: All Common tests passed + name: All pinned Common tests passed needs: test-common-pinned # Always run this, even if a dependent job failed if: always() diff --git a/.github/workflows/test-integrations-data-processing.yml b/.github/workflows/test-integrations-data-processing.yml index acabcd1748..49d18fc24c 100644 --- a/.github/workflows/test-integrations-data-processing.yml +++ b/.github/workflows/test-integrations-data-processing.yml @@ -193,7 +193,7 @@ jobs: files: .junitxml verbose: true check_required_tests: - name: All Data Processing tests passed + name: All pinned Data Processing tests passed needs: test-data_processing-pinned # Always run this, even if a dependent job failed if: always() diff --git a/.github/workflows/test-integrations-databases.yml b/.github/workflows/test-integrations-databases.yml index 741e8fc43e..49d3e923ee 100644 --- a/.github/workflows/test-integrations-databases.yml +++ b/.github/workflows/test-integrations-databases.yml @@ -211,7 +211,7 @@ jobs: files: .junitxml verbose: true check_required_tests: - name: All Databases tests passed + name: All pinned Databases tests passed needs: test-databases-pinned # Always run this, even if a dependent job failed if: always() diff --git a/.github/workflows/test-integrations-graphql.yml b/.github/workflows/test-integrations-graphql.yml index ba4091215e..2cefb5d191 100644 --- a/.github/workflows/test-integrations-graphql.yml +++ b/.github/workflows/test-integrations-graphql.yml @@ -157,7 +157,7 @@ jobs: files: .junitxml verbose: true check_required_tests: - name: All GraphQL tests passed + name: All pinned GraphQL tests passed needs: test-graphql-pinned # Always run this, even if a dependent job failed if: always() diff --git a/.github/workflows/test-integrations-miscellaneous.yml b/.github/workflows/test-integrations-miscellaneous.yml index 064d083335..0b49a27219 100644 --- a/.github/workflows/test-integrations-miscellaneous.yml +++ b/.github/workflows/test-integrations-miscellaneous.yml @@ -165,7 +165,7 @@ jobs: files: .junitxml verbose: true check_required_tests: - name: All Miscellaneous tests passed + name: All pinned Miscellaneous tests passed needs: test-miscellaneous-pinned # Always run this, even if a dependent job failed if: always() diff --git a/.github/workflows/test-integrations-networking.yml b/.github/workflows/test-integrations-networking.yml index 192eb1b35b..c24edff174 100644 --- a/.github/workflows/test-integrations-networking.yml +++ b/.github/workflows/test-integrations-networking.yml @@ -157,7 +157,7 @@ jobs: files: .junitxml verbose: true check_required_tests: - name: All Networking tests passed + name: All pinned Networking tests passed needs: test-networking-pinned # Always run this, even if a dependent job failed if: always() diff --git a/.github/workflows/test-integrations-web-frameworks-1.yml b/.github/workflows/test-integrations-web-frameworks-1.yml index f2bcb336dd..a655710843 100644 --- a/.github/workflows/test-integrations-web-frameworks-1.yml +++ b/.github/workflows/test-integrations-web-frameworks-1.yml @@ -193,7 +193,7 @@ jobs: files: .junitxml verbose: true check_required_tests: - name: All Web Frameworks 1 tests passed + name: All pinned Web Frameworks 1 tests passed needs: test-web_frameworks_1-pinned # Always run this, even if a dependent job failed if: always() diff --git a/.github/workflows/test-integrations-web-frameworks-2.yml b/.github/workflows/test-integrations-web-frameworks-2.yml index 8f6bd543df..d3f1001e2c 100644 --- a/.github/workflows/test-integrations-web-frameworks-2.yml +++ b/.github/workflows/test-integrations-web-frameworks-2.yml @@ -205,7 +205,7 @@ jobs: files: .junitxml verbose: true check_required_tests: - name: All Web Frameworks 2 tests passed + name: All pinned Web Frameworks 2 tests passed needs: test-web_frameworks_2-pinned # Always run this, even if a dependent job failed if: always() diff --git a/scripts/split-tox-gh-actions/templates/check_required.jinja b/scripts/split-tox-gh-actions/templates/check_required.jinja index b9b0f54015..ddb47cddf1 100644 --- a/scripts/split-tox-gh-actions/templates/check_required.jinja +++ b/scripts/split-tox-gh-actions/templates/check_required.jinja @@ -1,5 +1,5 @@ check_required_tests: - name: All {{ group }} tests passed + name: All pinned {{ group }} tests passed {% if "pinned" in categories %} needs: test-{{ group | replace(" ", "_") | lower }}-pinned {% endif %}