Skip to content

Commit af666df

Browse files
committed
refactor(tests): organize by test category for easier filtering and parallel CI runs
1 parent 6f69ced commit af666df

27 files changed

Lines changed: 25 additions & 25 deletions

server/tests/container/__init__.py

Whitespace-only changes.

server/tests/container/conftest.py

Whitespace-only changes.

server/tests/test_container_smoke.py renamed to server/tests/container/test_container_smoke.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from docker import DockerClient
77

8-
SERVER_DIR = Path(__file__).parent.parent
8+
SERVER_DIR = Path(__file__).parent.parent.parent
99

1010

1111
@pytest.fixture(scope="session")

server/tests/integration/__init__.py

Whitespace-only changes.

server/tests/integration/conftest.py

Whitespace-only changes.

server/tests/docker.py renamed to server/tests/integration/docker_compose.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313

1414
def test_compose(compose_file: Path) -> DockerCompose:
15-
current_path = Path(__file__).parent.resolve()
15+
current_path = Path(__file__).parent.parent.parent.resolve() # Navigate to server/ root
1616

1717
return DockerCompose(
18-
str(current_path.parent.resolve()),
19-
compose_file_name=str(current_path.parent.joinpath(compose_file).resolve()),
18+
str(current_path),
19+
compose_file_name=str(current_path / compose_file),
2020
build=True,
2121
)
2222

server/tests/integration/resources/__init__.py

Whitespace-only changes.

server/tests/integration/resources/docker-compose/__init__.py

Whitespace-only changes.

server/tests/docker/test-bash-ioc.yml renamed to server/tests/integration/resources/docker-compose/test-bash-ioc.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: test-bash-ioc
22
include:
3-
- ../../docker/cf-compose.yml
3+
- docker/cf-compose.yml
44
services:
55
recc1:
66
extends:
7-
file: ../../compose.yml
7+
file: compose.yml
88
service: recc
99
depends_on:
1010
cf:
@@ -16,7 +16,7 @@ services:
1616
- net-2-cf
1717
ioc1-1:
1818
extends:
19-
file: ../../../client/ioc-compose.yml
19+
file: ../client/ioc-compose.yml
2020
service: ioc1
2121
environment:
2222
- IOCSH_NAME=IOC1-1
@@ -40,5 +40,5 @@ volumes:
4040
driver: local
4141
driver_opts:
4242
type: none
43-
device: ../ioc
43+
device: ./ioc
4444
o: bind

0 commit comments

Comments
 (0)