diff options
-rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
-rw-r--r-- | test/CMakeLists.txt | 4 | ||||
-rw-r--r-- | test/requirements.txt (renamed from test/py/requirements.txt) | 0 | ||||
-rw-r--r-- | test/src/conftest.py (renamed from test/py/conftest.py) | 0 | ||||
-rw-r--r-- | test/src/lib/__init__.py (renamed from test/py/lib/__init__.py) | 0 | ||||
-rw-r--r-- | test/src/lib/db.py (renamed from test/py/lib/db.py) | 0 | ||||
-rw-r--r-- | test/src/lib/logging.py (renamed from test/py/lib/logging.py) | 0 | ||||
-rw-r--r-- | test/src/lib/net.py (renamed from test/py/lib/net.py) | 0 | ||||
-rw-r--r-- | test/src/lib/process.py (renamed from test/py/lib/process.py) | 0 | ||||
-rw-r--r-- | test/src/lib/test_repo.py (renamed from test/py/lib/test_repo.py) | 0 | ||||
-rw-r--r-- | test/src/lib/tests.py (renamed from test/py/lib/tests.py) | 0 | ||||
-rw-r--r-- | test/src/test_basic.py (renamed from test/py/test_basic.py) | 0 | ||||
-rw-r--r-- | test/src/test_repo.py (renamed from test/py/test_repo.py) | 0 |
13 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 02403b8..c977b1d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,12 +38,12 @@ jobs: # Unpin when this is fixed: https://github.com/python/cpython/issues/111615 python-version: '3.11' cache: pip - cache-dependency-path: ./test/py/requirements.txt + cache-dependency-path: ./test/requirements.txt - name: Install dependencies run: | sudo apt-get update sudo DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends $DEPS valgrind - pip install -q -r ./test/py/requirements.txt + pip install -q -r ./test/requirements.txt - name: Build run: make install - name: Upload binaries diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 29fd778..e31662f 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -13,7 +13,7 @@ endif() set(python_test_args --no-header -v --durations 0 --durations-min 1.0 - "${CMAKE_CURRENT_SOURCE_DIR}/py" + "${CMAKE_CURRENT_SOURCE_DIR}/src" --server "$<TARGET_FILE:server>" --worker "$<TARGET_FILE:worker>" --client "$<TARGET_FILE:client>" @@ -23,7 +23,7 @@ set(python_test_args function(add_python_tests name) list(POP_FRONT ARGV) add_test(NAME "${name}" - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/py" + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src" COMMAND ${ARGV}) set_tests_properties("${name}" PROPERTIES TIMEOUT 600) endfunction() diff --git a/test/py/requirements.txt b/test/requirements.txt index 43300f8..43300f8 100644 --- a/test/py/requirements.txt +++ b/test/requirements.txt diff --git a/test/py/conftest.py b/test/src/conftest.py index 6c34f4d..6c34f4d 100644 --- a/test/py/conftest.py +++ b/test/src/conftest.py diff --git a/test/py/lib/__init__.py b/test/src/lib/__init__.py index e69de29..e69de29 100644 --- a/test/py/lib/__init__.py +++ b/test/src/lib/__init__.py diff --git a/test/py/lib/db.py b/test/src/lib/db.py index de6960a..de6960a 100644 --- a/test/py/lib/db.py +++ b/test/src/lib/db.py diff --git a/test/py/lib/logging.py b/test/src/lib/logging.py index 663eb3a..663eb3a 100644 --- a/test/py/lib/logging.py +++ b/test/src/lib/logging.py diff --git a/test/py/lib/net.py b/test/src/lib/net.py index 06bfda0..06bfda0 100644 --- a/test/py/lib/net.py +++ b/test/src/lib/net.py diff --git a/test/py/lib/process.py b/test/src/lib/process.py index 3b1b6b9..3b1b6b9 100644 --- a/test/py/lib/process.py +++ b/test/src/lib/process.py diff --git a/test/py/lib/test_repo.py b/test/src/lib/test_repo.py index 1d07a4e..1d07a4e 100644 --- a/test/py/lib/test_repo.py +++ b/test/src/lib/test_repo.py diff --git a/test/py/lib/tests.py b/test/src/lib/tests.py index 7ccedef..7ccedef 100644 --- a/test/py/lib/tests.py +++ b/test/src/lib/tests.py diff --git a/test/py/test_basic.py b/test/src/test_basic.py index 26732fe..26732fe 100644 --- a/test/py/test_basic.py +++ b/test/src/test_basic.py diff --git a/test/py/test_repo.py b/test/src/test_repo.py index d68cd4a..d68cd4a 100644 --- a/test/py/test_repo.py +++ b/test/src/test_repo.py |