Skip to content

Commit b904502

Browse files
authored
Fixed orf#24 -- Changed default workdir to tests.
Change workdir to django/tests to avoid cache related tests that depend on the test runner being executed from that directory, and that fail otherwise.
1 parent e3221d2 commit b904502

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ RUN mkdir /tests/results && chown -R test:test /tests/results/
3333
USER test:test
3434
ENV PYTHONPATH "${PYTHONPATH}:/tests/django/"
3535
VOLUME /tests/django
36-
WORKDIR /tests/django
36+
WORKDIR /tests/django/tests

docker-compose.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ x-base: &base
1515
- ./oracle_entrypoint.sh:/oracle_entrypoint.sh
1616
# Using yaml merging here overwrites the arrays. Simpler to just mount this in every service.
1717
- ./oracle:/oracle
18-
entrypoint: bash -c "wait-for-it.sh -s -t 20 $${WAIT_FOR} -- python tests/runtests.py $$@" --
18+
entrypoint: bash -c "wait-for-it.sh -s -t 20 $${WAIT_FOR} -- python runtests.py $$@" --
1919

2020
x-postgres-base: &postgres-base
2121
environment:
@@ -32,14 +32,14 @@ services:
3232
<<: *base
3333
environment:
3434
- DJANGO_SETTINGS_MODULE=settings.test_sqlite
35-
entrypoint: python tests/runtests.py
35+
entrypoint: python runtests.py
3636
depends_on:
3737
- memcached
3838
- memcached2
3939

4040
sqlite-gis:
4141
<<: *base
42-
entrypoint: python tests/runtests.py
42+
entrypoint: python runtests.py
4343
environment:
4444
- DJANGO_SETTINGS_MODULE=settings.test_sqlite_gis
4545

@@ -124,7 +124,7 @@ services:
124124
environment:
125125
- DJANGO_SETTINGS_MODULE=settings.test_oracle
126126
- WAIT_FOR=oracle-db:1521
127-
entrypoint: /oracle_entrypoint.sh python tests/runtests.py
127+
entrypoint: /oracle_entrypoint.sh python runtests.py
128128
depends_on:
129129
- oracle-db
130130
- memcached

0 commit comments

Comments
 (0)