Skip to content

Commit

Permalink
Edited tests
Browse files Browse the repository at this point in the history
  • Loading branch information
saeedamen committed Jul 27, 2020
1 parent b7fa37e commit 0cb799b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 85 deletions.
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ help:
@echo " Build the docker image."
@echo "make test"
@echo " Build the docker image for testing and run them."
@echo "make test_local"
@echo " Build the docker image for testing and run them on a local environment/settings."
@echo "make doc"
@echo " Construct the documentation."
@echo "make tag"
Expand Down
64 changes: 0 additions & 64 deletions docker-compose.local.test.yml

This file was deleted.

23 changes: 4 additions & 19 deletions docker-compose.test.yml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,9 @@ services:
- ./tcapygen:/tcapy/tcapygen:ro
- ./artifacts:/tcapy/artifacts
- ./source:/source:ro
env_file: .tcapy.env
environment:
- APP_ENV=docker
- MONGO_AUTH_SOURCE=admin
- MONGO_INITDB_ROOT_USERNAME=tcapyuser
- MONGO_INITDB_ROOT_PASSWORD=tcapyuser
- MYSQL_USER=tcapyuser
- MYSQL_PASSWORD=tcapyuser
- MYSQL_ROOT_PASSWORD=tcapyuser
depends_on:
- celery
- redis
Expand All @@ -32,15 +27,10 @@ services:
target: test
working_dir: /tcapy
command: "celery -A tcapy.conf.celery_calls worker --purge --discard --loglevel=debug -Q celery --concurrency=14 -f test_celery.log"
env_file: .tcapy.env
environment:
- APP_ENV=docker
- C_FORCE_ROOT=true
- MONGO_AUTH_SOURCE=admin
- MONGO_INITDB_ROOT_USERNAME=tcapyuser
- MONGO_INITDB_ROOT_PASSWORD=tcapyuser
- MYSQL_USER=root
- MYSQL_PASSWORD=tcapyuser
- MYSQL_ROOT_PASSWORD=tcapyuser
depends_on:
- redis
- mongo
Expand All @@ -60,20 +50,15 @@ services:

mongo:
image: mongo:latest
environment:
- MONGO_AUTH_SOURCE=admin
- MONGO_INITDB_ROOT_USERNAME=tcapyuser
- MONGO_INITDB_ROOT_PASSWORD=tcapyuser
env_file: .tcapy.env
ports:
- 27017:27017

mysql:
image: mysql
command: --default-authentication-plugin=mysql_native_password
env_file: .tcapy.env
environment:
- MYSQL_USER=tcapyuser
- MYSQL_PASSWORD=tcapyuser
- MYSQL_ROOT_PASSWORD=tcapyuser
- MYSQL_DATABASE=trade_database_test_harness
ports:
- 3306:3306

0 comments on commit 0cb799b

Please sign in to comment.