Skip to content

Commit aee9dcf

Browse files
committed
Address review.
Rename tests directory, organize python imports.
1 parent 8dab035 commit aee9dcf

File tree

15 files changed

+21
-19
lines changed

15 files changed

+21
-19
lines changed

e2e_tests/.dockerignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

tests/.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# I gnore pytest cache
2+
.pytest_cache
File renamed without changes.
File renamed without changes.

e2e_tests/Makefile renamed to tests/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ build:
99
docker build -t $(PREFIX):$(TAG) -f docker/Dockerfile ..
1010

1111
run-tests: build
12-
docker run --rm -v $(AWS_CREDENTIALS):~/.aws/credentials $(PREFIX):$(TAG) --nginx-api=$(NGINX_API) --aws-region=$(AWS_REGION) $(PYTEST_ARGS)
12+
docker run --rm -v $(AWS_CREDENTIALS):/root/.aws/credentials $(PREFIX):$(TAG) --nginx-api=$(NGINX_API) --aws-region=$(AWS_REGION) $(PYTEST_ARGS)

e2e_tests/README.md renamed to tests/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ Run the tests:
3030
* Use Docker:
3131
```bash
3232
$ cd e2e_tests
33-
$ make build
3433
$ make run-tests AWS_CREDENTIALS=abs_path_to_creds_file NGINX_API=nginx_plus_api_url
3534
```
3635

File renamed without changes.

e2e_tests/conftest.py renamed to tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from boto3 import Session
44
from botocore.client import BaseClient
55

6-
from e2e_tests.settings import DEFAULT_AWS_REGION
6+
from tests.settings import DEFAULT_AWS_REGION
77

88

99
def pytest_addoption(parser) -> None:
File renamed without changes.

e2e_tests/docker/Dockerfile renamed to tests/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ RUN mkdir /workspace
44

55
WORKDIR /workspace
66

7-
COPY e2e_tests tests
7+
COPY tests tests
88

99
WORKDIR /workspace/tests
1010

0 commit comments

Comments
 (0)