lehenetsitako aldagaiak zuzenean cfg.lua fitxategietan txertatu.

tests/test.bash

@@ -19,7 +19,8 @@ registerTestUser() {
     local userName="$1"
     local containerName="$2"
     echo "Registering TestUser '$userName' in container '$containerName'"
-    sudo docker compose exec "$containerName" /bin/bash -c "/entrypoint.bash register $userName example.com 12345678"
+    sudo docker compose exec "$containerName" /bin/bash -c "prosodyctl register $userName example.com 12345678"
+    #sudo docker compose exec -e DOMAIN=example.com "$containerName" prosodyctl register "$userName" example.com 12345678
 }
 
 registerTestUsers() {
@@ -32,8 +33,7 @@ registerTestUsers() {
 
 runTests() {
     local containerName="$1"
-    python --version \
-    && python3 --version \
+    python3 --version \
     && python3 -m venv venv \
     && source venv/bin/activate \
     && python --version \
@@ -42,7 +42,7 @@ runTests() {
     && pytest \
     && deactivate \
     && sleep 5 \
-    && sudo docker-compose logs "$containerName" \
+    && sudo docker compose logs "$containerName" \
     && export batsContainerName="$containerName" \
     && ./bats/bats-core/bin/bats tests.bats \
     && ./bats/bats-core/bin/bats tests-"$containerName".bats
@@ -56,22 +56,25 @@ generateCert "upload.example.com"
 
 # Run tests for first container with postgres
 # Start postgres first and wait for 10 seconds before starting prosody.
-sudo docker-compose down
-sudo docker-compose up -d postgres
+docker compose down
+echo "1"
+docker compose up -d postgres
+echo "2"
 sleep 10
-sudo docker-compose up -d prosody_postgres
-
+docker compose up -d prosody_postgres
+echo "3"
 registerTestUsers prosody_postgres
 runTests prosody_postgres
-sudo docker-compose down
+docker compose down
 
+echo "HELLO"
 # Run tests for second container with SQLite
-sudo docker-compose up -d prosody
+docker compose up -d prosody
 registerTestUsers prosody
 runTests prosody
-sudo docker-compose down
-
+docker compose down
+echo "WORLD"
 # Run tests for prosody with ldap
-sudo docker-compose up -d prosody_ldap
+docker compose up -d prosody_ldap
 runTests prosody_ldap
-sudo docker-compose down
+docker compose down