Moved 'test_utils' inside 'tests' folder; add repository root to PYTH…

…ONPATH in conftest.py
Merkleize · Apr 20, 2024 · 8f325d6 · 8f325d6
1 parent 838c569
commit 8f325d6
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -36,8 +36,6 @@ jobs:
           pip install .
       - name: Create test wallet
         run: bash ./examples/init.sh
-      - name: Add repository root to PYTHONPATH
-        run: echo "PYTHONPATH=$PWD" >> $GITHUB_ENV
       - name: Run tests and capture output
         run: pytest -vv
       - name: Upload test output as artifact

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,12 +1,16 @@
 import pytest
 
+import sys
 import os
 from pathlib import Path
 
 from matt.btctools.auth_proxy import AuthServiceProxy
 from matt.manager import ContractManager
 from test_utils.utxograph import create_utxo_graph
 
+root_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), '../')
+sys.path.append(root_path)
+
 
 rpc_url = "http://%s:%s@%s:%s" % (
     os.getenv("BTC_RPC_USER", "rpcuser"),

diff --git a/test_utils/README.md → tests/test_utils/README.md b/test_utils/README.md → tests/test_utils/README.md
diff --git a/test_utils/__init__.py → tests/test_utils/__init__.py b/test_utils/__init__.py → tests/test_utils/__init__.py
diff --git a/test_utils/utxograph.py → tests/test_utils/utxograph.py b/test_utils/utxograph.py → tests/test_utils/utxograph.py