Renamed STORAGE to DEFAULT_STORAGE. Added ARCHIVE_STORE and STORAGE_ARCHIVE2.

tests/docker-compose.yml

@@ -32,7 +32,27 @@ services:
       E2E_POLICY_WHITELIST: "admin@localhost, user1@localhost"
       LOG_LEVEL: debug
       PROSODY_ADMINS: "admin@localhost, admin2@localhost"
-      STORAGE: "internal"
+      DEFAULT_STORAGE: "internal"
+      STORAGE_ARCHIVE2: "internal"
+    volumes:
+      - ./certs:/usr/local/etc/prosody/certs
+
+  prosody_internal_storage_archive:
+    image: prosody
+    restart: unless-stopped
+    ports:
+      - "5000:5000"
+      - "5222:5222"
+      - "5223:5223"
+      - "5269:5269"
+      - "5281:5281"
+    environment:
+      DOMAIN: localhost
+      E2E_POLICY_WHITELIST: "admin@localhost, user1@localhost"
+      LOG_LEVEL: debug
+      PROSODY_ADMINS: "admin@localhost, admin2@localhost"
+      DEFAULT_STORAGE: "internal"
+      ARCHIVE_STORE: "archive"
     volumes:
       - ./certs:/usr/local/etc/prosody/certs
 

tests/test.bash

@@ -64,14 +64,20 @@ registerTestUsers prosody_postgres
 runTests prosody_postgres
 sudo docker-compose down
 
-# Run tests for second container with SQLite
+# Run tests for container with SQLite
 sudo docker-compose up -d prosody
 registerTestUsers prosody
 runTests prosody
 sudo docker-compose down
 
-# Run tests for third container with internal storage
+# Run tests for container with internal storage and archive store archive2
 sudo docker-compose up -d prosody_internal_storage
 registerTestUsers prosody_internal_storage
 runTests prosody_internal_storage
 sudo docker-compose down
+
+# Run tests for container with internal storage and archive store archive
+sudo docker-compose up -d prosody_internal_storage_archive
+registerTestUsers prosody_internal_storage_archive
+runTests prosody_internal_storage_archive
+sudo docker-compose down

tests/tests-prosody_internal_storage_archive.bats

@@ -0,0 +1,21 @@
+# For tests with pipes see: https://github.com/sstephenson/bats/issues/10
+
+load 'bats/bats-support/load'
+load 'bats/bats-assert/load'
+
+# TODO
+#@test "Should use internal storage" {
+#  run bash -c "sudo docker-compose logs $batsContainerName | grep -E \"Connecting to \[SQLite3\] \/usr\/local\/var\/lib\/prosody\/prosody\.sqlite\.\.\.\""
+#  assert_failure
+#  assert_output
+#}
+
+@test "Should not use sqlite" {
+  run bash -c "sudo docker-compose logs $batsContainerName | grep -E \"Connecting to \[SQLite3\] \/usr\/local\/var\/lib\/prosody\/prosody\.sqlite\.\.\.\""
+  assert_failure
+}
+
+@test "Should not use postgres" {
+  run bash -c "sudo docker-compose logs $batsContainerName | grep -E \"Connecting to \[PostgreSQL\] prosody\.\.\.\""
+  assert_failure
+}

tests/tests.bats

@@ -86,3 +86,8 @@ load 'bats/bats-assert/load'
   assert_success
   assert_output
 }
+
+@test "Should not have any sql errors" {
+  run bash -c "sudo docker-compose logs $batsContainerName | grep --ignore-case Error in SQL transaction"
+  assert_failure
+}