diff --git a/.github/workflows/test-selenoid.yml b/.github/workflows/test-selenoid.yml index 7bbb373..274db9e 100644 --- a/.github/workflows/test-selenoid.yml +++ b/.github/workflows/test-selenoid.yml @@ -15,4 +15,6 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - name: Run tests - run: docker-compose -f docker-compose.test.yml run bot python -m pytest tests/bot/test_bot_selenoid.py -vv \ No newline at end of file + run: | + cd tests + docker-compose run test-bot python -m pytest tests/bot/test_bot_selenoid.py -vv \ No newline at end of file diff --git a/README.md b/README.md index 73fab91..c9d7606 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,8 @@ killall python ## Tests ```bash -SELENOIDTEST=1 docker-compose -f docker-compose.test.yml run bot python -m pytest tests/bot/test_bot_selenoid.py::test_selenoid_text -vv +cd tests +SELENOIDTEST=1 docker-compose run test-bot python -m pytest tests/bot/test_bot_selenoid.py::test_selenoid_text -vv ``` ## Help article diff --git a/docker-compose.yml b/docker-compose.yml index 480966e..b2a388b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,8 +22,6 @@ services: context: . dockerfile: ./deploy/Dockerfile.selenoid restart: unless-stopped - environment: - - SESSION_TIMED_OUT=30s networks: transport_bot_network: ipv4_address: 200.20.0.10 diff --git a/docker-compose.test.yml b/tests/docker-compose.yml similarity index 86% rename from docker-compose.test.yml rename to tests/docker-compose.yml index 1becee9..d812526 100644 --- a/docker-compose.test.yml +++ b/tests/docker-compose.yml @@ -9,32 +9,30 @@ networks: - subnet: 200.20.0.0/24 services: - selenoid: + test-selenoid: container_name: "transport_bot_selenoid" hostname: "selenoid_host" build: - context: . + context: .. dockerfile: ./deploy/Dockerfile.selenoid restart: unless-stopped - environment: - - SESSION_TIMED_OUT=30s networks: transport_bot_network: ipv4_address: 200.20.0.10 volumes: - - ./deploy/browsers.json:/etc/selenoid/browsers.json:ro + - ../deploy/browsers.json:/etc/selenoid/browsers.json:ro - /var/run/docker.sock:/var/run/docker.sock command: ["-conf", "/etc/selenoid/browsers.json", "-limit", "10", "-container-network", "transport_bot_network", "-timeout", "30s"] expose: - "4444" - bot: + test-bot: container_name: "transport_bot" hostname: "transport_bot" image: "transport_bot:latest" build: - context: . + context: .. dockerfile: ./deploy/Dockerfile.bot args: USER: root @@ -42,7 +40,7 @@ services: environment: SELENOIDTEST: ${SELENOIDTEST} depends_on: - - selenoid + - test-selenoid volumes: - /etc/localtime:/etc/localtime:ro networks: