Fix cache, try to list probes

golemfactory · Jun 21, 2023 · 4cdf17a · 4cdf17a
1 parent 99689b5
commit 4cdf17a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/.github/workflows/binaries-x86-64.yml b/.github/workflows/binaries-x86-64.yml
@@ -43,15 +43,18 @@ jobs:
           target: x86_64-unknown-linux-musl
           override: true
 
+      - name: Set build target for cache key
+        run: echo "CARGO_BUILD_TARGET=x86_64-unknown-linux-musl" >> $GITHUB_ENV
+
+      - name: Setup cache
+        uses: Swatinem/rust-cache@v2
+
       - name: Check lockfile
         uses: actions-rs/cargo@v1
         with:
           command: tree
           args: --locked
 
-      - name: Setup cache
-        uses: Swatinem/rust-cache@v2
-
       - name: Install openssl ( Windows only )
         if: runner.os == 'Windows'
         run: |

diff --git a/.github/workflows/system-test.yml b/.github/workflows/system-test.yml
@@ -31,15 +31,15 @@ jobs:
           toolchain: ${{ env.rust_stable }}
           components: rustfmt, clippy
 
+      - name: Setup cache
+        uses: Swatinem/rust-cache@v2
+
       - name: Check lockfile
         uses: actions-rs/cargo@v1
         with:
           command: tree
           args: --locked
 
-      - name: Setup cache
-        uses: Swatinem/rust-cache@v2
-
       - name: Install openssl ( Windows only )
         if: runner.os == 'Windows'
         run: |

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -35,15 +35,15 @@ jobs:
           toolchain: ${{ env.rust_stable }}
           components: rustfmt, clippy
 
+      - name: Setup cache
+        uses: Swatinem/rust-cache@v2
+
       - name: Check lockfile
         uses: actions-rs/cargo@v1
         with:
           command: tree
           args: --locked
 
-      - name: Setup cache
-        uses: Swatinem/rust-cache@v2
-
       - name: Check formatting
         uses: actions-rs/cargo@v1
         with:

diff --git a/goth_tests/e2e/vm/test_e2e_rule_partner_outbound.py b/goth_tests/e2e/vm/test_e2e_rule_partner_outbound.py
@@ -18,7 +18,7 @@
 from goth.runner import Runner
 from goth.runner.container.payment import PaymentIdPool
 from goth.runner.container.yagna import YagnaContainerConfig
-from goth.runner.probe import RequestorProbe
+from goth.runner.probe import Probe, RequestorProbe
 
 from goth_tests.helpers.activity import vm_exe_script_outbound
 from goth_tests.helpers.negotiation import DemandBuilder, negotiate_agreements
@@ -73,6 +73,7 @@ async def test_e2e_rule_partner_outbound(
     )
 
     async with runner(goth_config.containers):
+        logger.info("Probes: %s", runner.get_probes(probe_type=Probe))
         requestor = runner.get_probes(probe_type=RequestorProbe)[0]
         provider = runner.get_probes(probe_type=ProviderProbe)[0]
 

diff --git a/goth_tests/e2e/vm/test_e2e_rule_partner_outbound_unrestricted.py b/goth_tests/e2e/vm/test_e2e_rule_partner_outbound_unrestricted.py
@@ -18,7 +18,7 @@
 from goth.runner import Runner
 from goth.runner.container.payment import PaymentIdPool
 from goth.runner.container.yagna import YagnaContainerConfig
-from goth.runner.probe import RequestorProbe
+from goth.runner.probe import Probe, RequestorProbe
 
 from goth_tests.helpers.activity import vm_exe_script_outbound
 from goth_tests.helpers.negotiation import DemandBuilder, negotiate_agreements
@@ -73,6 +73,7 @@ async def test_e2e_rule_partner_outbound_unrestricted(
     )
 
     async with runner(goth_config.containers):
+        logger.info("Probes: %s", runner.get_probes(probe_type=Probe))
         requestor = runner.get_probes(probe_type=RequestorProbe)[0]
         provider = runner.get_probes(probe_type=ProviderProbe)[0]
 

diff --git a/goth_tests/pyproject.toml b/goth_tests/pyproject.toml
@@ -33,6 +33,6 @@ poethepoet = "^0.10.0"
 [tool.poe.tasks]
 codestyle = "black --check --diff ."
 goth-assets = "python -m goth create-assets assets"
-goth-tests = "pytest -svx . --reruns 3 --only-rerun AssertionError --only-rerun TimeoutError --only-rerun ApiException --only-rerun goth.runner.exceptions.TemporalAssertionError --only-rerun urllib.error.URLError --only-rerun goth.runner.exceptions.CommandError"
+goth-tests = "pytest -svx . -k 'e2e_rule_partner' --reruns 3 --only-rerun AssertionError --only-rerun TimeoutError --only-rerun ApiException --only-rerun goth.runner.exceptions.TemporalAssertionError --only-rerun urllib.error.URLError --only-rerun goth.runner.exceptions.CommandError"
 provider-tests = "pytest -svx ./domain/ya-provider"
 typecheck = "mypy ."