Merge pull request #160 from rafsaf/fix-acceptance-tests

fix issues issues with acceptance tests

.env.example

@@ -1,13 +1,6 @@
 POSTGRESQL_DB_PG_16=host=localhost port=10016 password=password-_-12!@#%^&*()/;><.,]}{[ user=user-_-12!@#%^&*()/;><.,]}{[ db=database-_-12!@#%^&*()/;><.,]}{[ cron_rule=* * * * *
-POSTGRESQL_DB_PG_15=host=localhost port=10015 password=password-_-12!@#%^&*()/;><.,]}{[ user=user-_-12!@#%^&*()/;><.,]}{[ db=database-_-12!@#%^&*()/;><.,]}{[ cron_rule=* * * * *
-POSTGRESQL_DB_PG_14=host=localhost port=10014 password=password-_-12!@#%^&*()/;><.,]}{[ user=user-_-12!@#%^&*()/;><.,]}{[ db=database-_-12!@#%^&*()/;><.,]}{[ cron_rule=* * * * *
-POSTGRESQL_DB_PG_13=host=localhost port=10013 password=password-_-12!@#%^&*()/;><.,]}{[ user=user-_-12!@#%^&*()/;><.,]}{[ db=database-_-12!@#%^&*()/;><.,]}{[ cron_rule=* * * * *
-MYSQL_DB_TEST_57=host=localhost port=10057 password=password-_-12!@#%^&*()/;><.,]}{[ user=user-_-12!@#%^&*()/;><.,]}{[ db=database-_-12!@#%^&*()/;><.,]}{[ cron_rule=* * * * *
-MYSQL_DB_TEST_80=host=localhost port=10080 password=password-_-12!@#%^&*()/;><.,]}{[ user=user-_-12!@#%^&*()/;><.,]}{[ db=database-_-12!@#%^&*()/;><.,]}{[ cron_rule=* * * * *
-MYSQL_DB_TEST_81=host=localhost port=10081 password=password-_-12!@#%^&*()/;><.,]}{[ user=user-_-12!@#%^&*()/;><.,]}{[ db=database-_-12!@#%^&*()/;><.,]}{[ cron_rule=* * * * *
-MARIADB_DB_TEST_1101=host=localhost port=11101 password=password-_-12!@#%^&*()/;><.,]}{[ user=user-_-12!@#%^&*()/;><.,]}{[ db=database-_-12!@#%^&*()/;><.,]}{[ cron_rule=* * * * *
-MARIADB_DB_TEST_1011=host=localhost port=11011 password=password-_-12!@#%^&*()/;><.,]}{[ user=user-_-12!@#%^&*()/;><.,]}{[ db=database-_-12!@#%^&*()/;><.,]}{[ cron_rule=* * * * *
-MARIADB_DB_TEST_1006=host=localhost port=11006 password=password-_-12!@#%^&*()/;><.,]}{[ user=user-_-12!@#%^&*()/;><.,]}{[ db=database-_-12!@#%^&*()/;><.,]}{[ cron_rule=* * * * *
+MYSQL_DB_TEST_80=host=localhost port=9080 password=password-_-12!@#%^&*()/;><.,]}{[ user=user-_-12!@#%^&*()/;><.,]}{[ db=database-_-12!@#%^&*()/;><.,]}{[ cron_rule=* * * * *
+MARIADB_DB_TEST_1011=host=localhost port=12011 password=password-_-12!@#%^&*()/;><.,]}{[ user=user-_-12!@#%^&*()/;><.,]}{[ db=database-_-12!@#%^&*()/;><.,]}{[ cron_rule=* * * * *
 #SINGLEFILE_MY_TEST_FILE=abs_path=/home/somefolder/somefile cron_rule=* * * * *
 #DIRECTORY_MY_TEST_FOLDER=abs_path=/home/somefolder/someotherfolder cron_rule=* * * * *
 LOG_LEVEL=INFO

Makefile

@@ -12,10 +12,10 @@ tests_arm64:
 	docker compose -f docker/docker-compose.tests.yml run --rm backuper_tests_arm64
 
 acceptance_tests_amd64:
-	docker compose -f docker/docker-compose.tests.yml run --rm backuper_acceptance_test_amd64
+	docker compose -f docker/docker-compose.acceptance.yml run --rm backuper_acceptance_test_amd64
 
 acceptance_tests_arm64:
-	docker compose -f docker/docker-compose.tests.yml run --rm backuper_acceptance_test_arm64
+	docker compose -f docker/docker-compose.acceptance.yml run --rm backuper_acceptance_test_arm64
 
 update_compose_db_file:
 	poetry run python backuper/tools/compose_file_generator.py > docker/docker-compose.dbs.yml

docker/docker-compose.acceptance.yml

@@ -9,7 +9,7 @@ services:
       target: build
     command: python -m backuper.main --single
     env_file:
-      - .env
+      - ./../.env
 
   backuper_acceptance_test_arm64:
     restart: "no"
@@ -21,4 +21,4 @@ services:
       target: build
     command: python -m backuper.main --single
     env_file:
-      - .env
+      - ./../.env