mirror of
https://github.com/Balshgit/mosgortrans.git
synced 2025-09-11 13:00:40 +03:00
move test docker-compose file to tests
This commit is contained in:
parent
ca004145e7
commit
c87c12f1bb
4
.github/workflows/test-selenoid.yml
vendored
4
.github/workflows/test-selenoid.yml
vendored
@ -15,4 +15,6 @@ jobs:
|
|||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: docker-compose -f docker-compose.test.yml run bot python -m pytest tests/bot/test_bot_selenoid.py -vv
|
run: |
|
||||||
|
cd tests
|
||||||
|
docker-compose run test-bot python -m pytest tests/bot/test_bot_selenoid.py -vv
|
@ -26,7 +26,8 @@ killall python
|
|||||||
## Tests
|
## Tests
|
||||||
|
|
||||||
```bash
|
```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
|
## Help article
|
||||||
|
@ -22,8 +22,6 @@ services:
|
|||||||
context: .
|
context: .
|
||||||
dockerfile: ./deploy/Dockerfile.selenoid
|
dockerfile: ./deploy/Dockerfile.selenoid
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
|
||||||
- SESSION_TIMED_OUT=30s
|
|
||||||
networks:
|
networks:
|
||||||
transport_bot_network:
|
transport_bot_network:
|
||||||
ipv4_address: 200.20.0.10
|
ipv4_address: 200.20.0.10
|
||||||
|
@ -9,32 +9,30 @@ networks:
|
|||||||
- subnet: 200.20.0.0/24
|
- subnet: 200.20.0.0/24
|
||||||
|
|
||||||
services:
|
services:
|
||||||
selenoid:
|
test-selenoid:
|
||||||
container_name: "transport_bot_selenoid"
|
container_name: "transport_bot_selenoid"
|
||||||
hostname: "selenoid_host"
|
hostname: "selenoid_host"
|
||||||
build:
|
build:
|
||||||
context: .
|
context: ..
|
||||||
dockerfile: ./deploy/Dockerfile.selenoid
|
dockerfile: ./deploy/Dockerfile.selenoid
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
|
||||||
- SESSION_TIMED_OUT=30s
|
|
||||||
networks:
|
networks:
|
||||||
transport_bot_network:
|
transport_bot_network:
|
||||||
ipv4_address: 200.20.0.10
|
ipv4_address: 200.20.0.10
|
||||||
volumes:
|
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
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
command: ["-conf", "/etc/selenoid/browsers.json", "-limit", "10",
|
command: ["-conf", "/etc/selenoid/browsers.json", "-limit", "10",
|
||||||
"-container-network", "transport_bot_network", "-timeout", "30s"]
|
"-container-network", "transport_bot_network", "-timeout", "30s"]
|
||||||
expose:
|
expose:
|
||||||
- "4444"
|
- "4444"
|
||||||
|
|
||||||
bot:
|
test-bot:
|
||||||
container_name: "transport_bot"
|
container_name: "transport_bot"
|
||||||
hostname: "transport_bot"
|
hostname: "transport_bot"
|
||||||
image: "transport_bot:latest"
|
image: "transport_bot:latest"
|
||||||
build:
|
build:
|
||||||
context: .
|
context: ..
|
||||||
dockerfile: ./deploy/Dockerfile.bot
|
dockerfile: ./deploy/Dockerfile.bot
|
||||||
args:
|
args:
|
||||||
USER: root
|
USER: root
|
||||||
@ -42,7 +40,7 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
SELENOIDTEST: ${SELENOIDTEST}
|
SELENOIDTEST: ${SELENOIDTEST}
|
||||||
depends_on:
|
depends_on:
|
||||||
- selenoid
|
- test-selenoid
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
networks:
|
networks:
|
Loading…
x
Reference in New Issue
Block a user