Skip to content

Commit 151081c

Browse files
committed
setup proper testkit configuration for docker
1 parent da41e20 commit 151081c

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

.github/workflows/testkit.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,5 @@ jobs:
6868
6969
- name: Run integration tests
7070
run: |
71-
docker compose up -d --remove-orphans --wait --no-build \
72-
server1 \
73-
server2 \
74-
server3 \
75-
server4 \
76-
testkit_backend
77-
78-
docker compose run --rm testkit ./testkit.sh
71+
docker compose up -d --remove-orphans --wait --no-build testkit_backend neo4j
72+
docker compose up testkit

docker-compose.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ services:
119119

120120
testkit:
121121
image: python:3.13
122+
command: ./testkit.sh
122123
volumes:
123124
- .:/opt/project
124125
working_dir: /opt/project/testkit-backend
@@ -131,6 +132,9 @@ services:
131132
TEST_DRIVER_NAME: php
132133
TEST_DRIVER_REPO: /opt/project
133134
TEST_BACKEND_HOST: testkit_backend
135+
TEST_STUB_HOST: testkit
136+
depends_on:
137+
- testkit_backend
134138

135139
testkit_backend:
136140
<<: *common-php
@@ -141,7 +145,5 @@ services:
141145
- neo4j
142146
extra_hosts:
143147
- "host.docker.internal:host-gateway"
144-
depends_on:
145-
- neo4j
146148
ports:
147149
- "9876:9876"

testkit-backend/testkit.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_long_string
6969
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_custom_resolver|| EXIT_CODE=1
7070
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_fail_nicely_when_using_http_port|| EXIT_CODE=1
7171
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_supports_multi_db|| EXIT_CODE=1
72-
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_multi_db_non_existing
73-
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_multi_db|| EXIT_CODE=1
72+
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_multi_db_non_existing || EXIT_CODE=1
73+
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_multi_db || EXIT_CODE=1
7474
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_multi_db_various_databases|| EXIT_CODE=1
7575
##
7676
###test_summary

0 commit comments

Comments
 (0)