aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.github/workflows/ci.yml4
-rw-r--r--test/integration/docker/.dockerignore (renamed from .ci/docker/.dockerignore)0
-rw-r--r--test/integration/docker/client/etc/cgitize.toml (renamed from .ci/docker/client/etc/cgitize.toml)0
-rw-r--r--test/integration/docker/client/output/.gitignore (renamed from .ci/docker/client/output/.gitignore)0
-rw-r--r--test/integration/docker/docker-compose.yml (renamed from .ci/docker/docker-compose.yml)2
-rw-r--r--test/integration/docker/server/Dockerfile (renamed from .ci/docker/server/Dockerfile)0
-rwxr-xr-xtest/integration/docker/server/setup_repo.sh (renamed from .ci/docker/server/setup_repo.sh)0
-rw-r--r--test/integration/docker/ssh/client_key (renamed from .ci/docker/ssh/client_key)0
-rw-r--r--test/integration/docker/ssh/client_key.pub (renamed from .ci/docker/ssh/client_key.pub)0
-rw-r--r--test/integration/docker/ssh/server_key (renamed from .ci/docker/ssh/server_key)0
-rw-r--r--test/integration/docker/ssh/server_key.pub (renamed from .ci/docker/ssh/server_key.pub)0
-rwxr-xr-xtest/integration/docker/test.sh (renamed from .ci/docker/test.sh)0
-rwxr-xr-xtest/integration/local/test.sh (renamed from .ci/local/test.sh)0
-rw-r--r--test/unit/__init__.py0
-rw-r--r--test/unit/test_bitbucket.py (renamed from test/test_bitbucket.py)0
-rw-r--r--test/unit/test_github.py (renamed from test/test_github.py)0
16 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index da2f831..feb74f2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
- name: Install dependencies
run: pip install -r requirements.txt
- name: Integration tests
- run: ./.ci/local/test.sh
+ run: ./test/integration/local/test.sh
- name: Unit tests
run: python -m unittest --buffer
@@ -37,7 +37,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
- name: Integration tests
- run: ./.ci/docker/test.sh
+ run: ./test/integration/docker/test.sh
publish_docker:
needs: [test_local, test_docker]
diff --git a/.ci/docker/.dockerignore b/test/integration/docker/.dockerignore
index c0cb0ce..c0cb0ce 100644
--- a/.ci/docker/.dockerignore
+++ b/test/integration/docker/.dockerignore
diff --git a/.ci/docker/client/etc/cgitize.toml b/test/integration/docker/client/etc/cgitize.toml
index 4e8fda7..4e8fda7 100644
--- a/.ci/docker/client/etc/cgitize.toml
+++ b/test/integration/docker/client/etc/cgitize.toml
diff --git a/.ci/docker/client/output/.gitignore b/test/integration/docker/client/output/.gitignore
index 355164c..355164c 100644
--- a/.ci/docker/client/output/.gitignore
+++ b/test/integration/docker/client/output/.gitignore
diff --git a/.ci/docker/docker-compose.yml b/test/integration/docker/docker-compose.yml
index 6054764..c04bfb3 100644
--- a/.ci/docker/docker-compose.yml
+++ b/test/integration/docker/docker-compose.yml
@@ -7,7 +7,7 @@ services:
image: server
client:
build:
- context: ../..
+ context: ../../..
dockerfile: Dockerfile
image: client
volumes:
diff --git a/.ci/docker/server/Dockerfile b/test/integration/docker/server/Dockerfile
index a6283d0..a6283d0 100644
--- a/.ci/docker/server/Dockerfile
+++ b/test/integration/docker/server/Dockerfile
diff --git a/.ci/docker/server/setup_repo.sh b/test/integration/docker/server/setup_repo.sh
index 82ae711..82ae711 100755
--- a/.ci/docker/server/setup_repo.sh
+++ b/test/integration/docker/server/setup_repo.sh
diff --git a/.ci/docker/ssh/client_key b/test/integration/docker/ssh/client_key
index 7502c82..7502c82 100644
--- a/.ci/docker/ssh/client_key
+++ b/test/integration/docker/ssh/client_key
diff --git a/.ci/docker/ssh/client_key.pub b/test/integration/docker/ssh/client_key.pub
index 6b0e3e9..6b0e3e9 100644
--- a/.ci/docker/ssh/client_key.pub
+++ b/test/integration/docker/ssh/client_key.pub
diff --git a/.ci/docker/ssh/server_key b/test/integration/docker/ssh/server_key
index 07774eb..07774eb 100644
--- a/.ci/docker/ssh/server_key
+++ b/test/integration/docker/ssh/server_key
diff --git a/.ci/docker/ssh/server_key.pub b/test/integration/docker/ssh/server_key.pub
index 601277f..601277f 100644
--- a/.ci/docker/ssh/server_key.pub
+++ b/test/integration/docker/ssh/server_key.pub
diff --git a/.ci/docker/test.sh b/test/integration/docker/test.sh
index 7c76298..7c76298 100755
--- a/.ci/docker/test.sh
+++ b/test/integration/docker/test.sh
diff --git a/.ci/local/test.sh b/test/integration/local/test.sh
index 088539b..088539b 100755
--- a/.ci/local/test.sh
+++ b/test/integration/local/test.sh
diff --git a/test/unit/__init__.py b/test/unit/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/unit/__init__.py
diff --git a/test/test_bitbucket.py b/test/unit/test_bitbucket.py
index 7a070ce..7a070ce 100644
--- a/test/test_bitbucket.py
+++ b/test/unit/test_bitbucket.py
diff --git a/test/test_github.py b/test/unit/test_github.py
index be1daf6..be1daf6 100644
--- a/test/test_github.py
+++ b/test/unit/test_github.py