From 40d8564265b78b146def7a6689bbb4ecbdb188dc Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 17 Jun 2023 13:42:19 +0100 Subject: [PATCH 1/2] The fixture should be session scoped Signed-off-by: Pedro Algarvio --- pkg/tests/conftest.py | 2 +- pkg/tests/integration/test_pkg.py | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkg/tests/conftest.py b/pkg/tests/conftest.py index 293a43603e9..0bcf2252227 100644 --- a/pkg/tests/conftest.py +++ b/pkg/tests/conftest.py @@ -44,7 +44,7 @@ def grains(sminion): return sminion.opts["grains"].copy() -@pytest.fixture(scope="module", autouse=True) +@pytest.fixture(scope="session", autouse=True) def _system_up_to_date( grains, shell, diff --git a/pkg/tests/integration/test_pkg.py b/pkg/tests/integration/test_pkg.py index ef220b124b6..5aedefa6ef1 100644 --- a/pkg/tests/integration/test_pkg.py +++ b/pkg/tests/integration/test_pkg.py @@ -3,13 +3,6 @@ import sys import pytest -@pytest.fixture(scope="module") -def grains(salt_call_cli): - ret = salt_call_cli.run("--local", "grains.items") - assert ret.data, ret - return ret.data - - @pytest.fixture(scope="module") def pkg_name(salt_call_cli, grains): if sys.platform.startswith("win"): From aa41d926ea40e2b8a2a67e4dbdb83ed1ebf8a6d8 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 17 Jun 2023 20:43:47 +0100 Subject: [PATCH 2/2] Forgot the result Signed-off-by: Pedro Algarvio --- .github/workflows/nightly.yml | 2 +- .github/workflows/templates/nightly.yml.jinja | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index c42be44c1bd..75aea9f8afb 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -2113,7 +2113,7 @@ jobs: "type": "section", "text": { "type": "mrkdwn", - "text": "Nightly Workflow build result for the `${{ github.ref_name }}` branch(attempt: ${{ github.run_attempt }})\n${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" + "text": "Nightly Workflow build result for the `${{ github.ref_name }}` branch(attempt: ${{ github.run_attempt }}): `${{ steps.get-workflow-info.outputs.conclusion }}`\n${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" } } ] diff --git a/.github/workflows/templates/nightly.yml.jinja b/.github/workflows/templates/nightly.yml.jinja index 391ffc6170a..ae77bdda713 100644 --- a/.github/workflows/templates/nightly.yml.jinja +++ b/.github/workflows/templates/nightly.yml.jinja @@ -133,7 +133,7 @@ concurrency: "type": "section", "text": { "type": "mrkdwn", - "text": "Nightly Workflow build result for the `${{ github.ref_name }}` branch(attempt: ${{ github.run_attempt }})\n${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" + "text": "Nightly Workflow build result for the `${{ github.ref_name }}` branch(attempt: ${{ github.run_attempt }}): `${{ steps.get-workflow-info.outputs.conclusion }}`\n${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" } } ]