From 5642f139df4e1f760d010357678e062b38dc704b Mon Sep 17 00:00:00 2001
From: BuckarooBanzay <BuckarooBanzay@users.noreply.github.com>
Date: Tue, 2 Aug 2022 14:56:32 +0200
Subject: [PATCH] use `mtt` for integration tests

---
 .github/workflows/integration-test.yml |  15 -----
 .github/workflows/test.yml             |  17 ++++++
 .luacheckrc                            |   2 +-
 README.md                              |   2 +-
 docker-compose.yml                     |  19 ++++++
 init.lua                               |   4 ++
 mod.conf                               |   4 +-
 mtt.lua                                |  10 ++++
 test/Dockerfile                        |  10 ++++
 test/auth.sqlite                       | Bin 24576 -> 0 bytes
 test/auth.txt                          |   4 --
 test/integration-test.sh               |  79 -------------------------
 test/minetest.conf                     |   7 +--
 test/start.sh                          |  10 ----
 test/test_mod/init.lua                 |   7 ---
 test/test_mod/mod.conf                 |   2 -
 test/world.mt                          |  13 ++--
 17 files changed, 75 insertions(+), 130 deletions(-)
 delete mode 100644 .github/workflows/integration-test.yml
 create mode 100644 .github/workflows/test.yml
 create mode 100644 docker-compose.yml
 create mode 100644 mtt.lua
 create mode 100644 test/Dockerfile
 delete mode 100644 test/auth.sqlite
 delete mode 100644 test/auth.txt
 delete mode 100755 test/integration-test.sh
 delete mode 100755 test/start.sh
 delete mode 100644 test/test_mod/init.lua
 delete mode 100644 test/test_mod/mod.conf

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
deleted file mode 100644
index c9dd6f5..0000000
--- a/.github/workflows/integration-test.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: integration-test
-
-on: [push, pull_request]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-
-    steps:
-    - uses: actions/checkout@master
-
-    - name: integration-test
-      run: ./test/integration-test.sh
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000..53f6399
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,17 @@
+name: test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    strategy:
+      matrix:
+        ENGINE_VERSION: [5.3.0, 5.4.0, 5.5.0, latest]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: test
+      run: docker-compose up --exit-code-from sut
diff --git a/.luacheckrc b/.luacheckrc
index 71b6fae..9bd0493 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -18,5 +18,5 @@ read_globals = {
 	"unified_inventory", "default",
 
 	-- optional mods
-	"xban", "QoS"
+	"xban", "QoS", "mtt"
 }
diff --git a/README.md b/README.md
index f824c98..dce43c6 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Mail mod for Minetest (ingame mod)
 ======
 
-![](https://github.com/minetest-mail/mail_mod/workflows/integration-test/badge.svg)
+![](https://github.com/minetest-mail/mail_mod/workflows/test/badge.svg)
 ![](https://github.com/minetest-mail/mail_mod/workflows/luacheck/badge.svg)
 
 
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..865f083
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,19 @@
+version: "3.6"
+
+services:
+ sut:
+  build:
+   context: ./test
+   args:
+    ENGINE_VERSION: ${ENGINE_VERSION:-5.5.0}
+  user: root
+  volumes:
+    - "./:/root/.minetest/worlds/world/worldmods/mail/"
+    - "world_data:/root/.minetest/worlds/world"
+    - "./test/world.mt:/root/.minetest/worlds/world/world.mt"
+    - "./test/minetest.conf:/minetest.conf"
+  ports:
+    - "30000:30000/udp"
+
+volumes:
+  world_data: {}
\ No newline at end of file
diff --git a/init.lua b/init.lua
index 0f947ee..1b67e7e 100644
--- a/init.lua
+++ b/init.lua
@@ -64,3 +64,7 @@ end
 
 -- migrate storage
 mail.migrate()
+
+if minetest.get_modpath("mtt") then
+	dofile(MP .. "/mtt.lua")
+end
\ No newline at end of file
diff --git a/mod.conf b/mod.conf
index 7e9f894..e38d49b 100644
--- a/mod.conf
+++ b/mod.conf
@@ -1,3 +1,3 @@
 name = mail
-description = mail mod
-optional_depends = unified_inventory,default,xban2,qos
+description = ingame mail-system
+optional_depends = unified_inventory,default,xban2,qos,mtt
diff --git a/mtt.lua b/mtt.lua
new file mode 100644
index 0000000..61c51da
--- /dev/null
+++ b/mtt.lua
@@ -0,0 +1,10 @@
+
+mtt.register("send mail", function(callback)
+    -- send a mail
+    mail.send("player1", "player2", "something", "blah")
+
+    -- check the receivers inbox
+    local list2 = mail.getMessages("player2")
+    assert(list2 ~= nil and #list2 > 0)
+    callback()
+end)
\ No newline at end of file
diff --git a/test/Dockerfile b/test/Dockerfile
new file mode 100644
index 0000000..6324d80
--- /dev/null
+++ b/test/Dockerfile
@@ -0,0 +1,10 @@
+ARG ENGINE_VERSION=5.5.0
+FROM registry.gitlab.com/minetest/minetest/server:${ENGINE_VERSION}
+
+USER root
+RUN apk add git &&\
+    mkdir -p /root/.minetest/worlds/world/worldmods/ &&\
+    git clone https://github.com/BuckarooBanzay/mtt /root/.minetest/worlds/world/worldmods/mtt
+
+
+ENTRYPOINT minetestserver --config /minetest.conf
\ No newline at end of file
diff --git a/test/auth.sqlite b/test/auth.sqlite
deleted file mode 100644
index e3f882920a157151ebc4af34d92adacfd6ff78b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 24576
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

diff --git a/test/auth.txt b/test/auth.txt
deleted file mode 100644
index 9c8c6d1..0000000
--- a/test/auth.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-User,Password
------------------
-test,enter
-test2,enter
diff --git a/test/integration-test.sh b/test/integration-test.sh
deleted file mode 100755
index 4ec5a59..0000000
--- a/test/integration-test.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-
-MINETEST_VERSION=5.2.0
-
-# prerequisites
-jq --version || exit 1
-curl --version || exit 1
-
-# ensure proper current directory
-CWD=$(dirname $0)
-cd ${CWD}
-
-# setup
-unset use_proxy
-unset http_proxy
-unset https_proxy
-unset HTTP_PROXY
-unset HTTPS_PROXY
-
-# run mail-server
-docker pull minetestmail/mail
-docker run --name mail --rm \
- -e WEBMAILKEY=myserverkey \
- -e WEBMAIL_DEBUG=true \
- --network host \
- minetestmail/mail &
-
-# wait for startup
-bash -c 'while !</dev/tcp/localhost/8080; do sleep 1; done;'
-
-# start minetest with mail mod
-docker pull registry.gitlab.com/minetest/minetest/server:${MINETEST_VERSION}
-docker run --rm --name minetest \
-  -u root:root \
-	-v $(pwd)/minetest.conf:/etc/minetest/minetest.conf:ro \
-  -v $(pwd)/world.mt:/root/.minetest/worlds/world/world.mt \
-  -v $(pwd)/auth.sqlite:/root/.minetest/worlds/world/auth.sqlite \
-  -v $(pwd)/../:/root/.minetest/worlds/world/worldmods/mail \
-  -v $(pwd)/test_mod:/root/.minetest/worlds/world/worldmods/mail_test \
-  -e use_proxy=false \
-  -e http_proxy= \
-  -e HTTP_PROXY= \
-  --network host \
-	registry.gitlab.com/minetest/minetest/server:${MINETEST_VERSION} &
-
-# prepare cleanup
-function cleanup {
-	# cleanup
-	docker stop mail
-  docker stop minetest
-}
-
-trap cleanup EXIT
-
-# wait for startup
-sleep 5
-
-# Execute calls against mail-server
-
-# login
-LOGIN_DATA='{"username":"test","password":"enter"}'
-RES=$(curl --data "${LOGIN_DATA}" -H "Content-Type: application/json" "http://127.0.0.1:8080/api/login")
-echo Login response: $RES
-SUCCESS=$(echo $RES | jq -r .success)
-TOKEN=$(echo $RES | jq -r .token)
-
-# login succeeded
-test "$SUCCESS" == "true" || exit 1
-# token extracted
-test -n "$TOKEN" || exit 1
-
-# fetch mails
-RES=$(curl -H "Authorization: ${TOKEN}" "http://127.0.0.1:8080/api/inbox")
-echo Mailbox: ${RES}
-
-# inbox count is 1
-test "$(echo $RES | jq '. | length')" == "1" || exit 1
-
-echo "Test complete!"
diff --git a/test/minetest.conf b/test/minetest.conf
index b5c7189..992f787 100644
--- a/test/minetest.conf
+++ b/test/minetest.conf
@@ -1,4 +1,3 @@
-secure.http_mods = mail
-webmail.url = http://localhost:8080
-webmail.key = myserverkey
-webmail.disallow_banned_players = true
+default_game = minetest_game
+mg_name = v7
+mtt_enable = true
\ No newline at end of file
diff --git a/test/start.sh b/test/start.sh
deleted file mode 100755
index 7bab738..0000000
--- a/test/start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-docker run --rm -it \
-	-u root:root \
-	-v $(pwd)/minetest.conf:/etc/minetest/minetest.conf \
-	-v $(pwd)/auth.sqlite:/root/.minetest/worlds/world/auth.sqlite \
-	-v $(pwd)/../:/root/.minetest/worlds/world/worldmods/mail_mod \
-	-v mail_world:/root/.minetest/worlds/world/ \
-	--network host \
-	registry.gitlab.com/minetest/minetest/server:5.2.0
diff --git a/test/test_mod/init.lua b/test/test_mod/init.lua
deleted file mode 100644
index 6ef604f..0000000
--- a/test/test_mod/init.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-
-minetest.log("warning", "[TEST] integration-test enabled!")
-
-minetest.register_on_mods_loaded(function()
-	minetest.log("warning", "[TEST] starting tests")
-	mail.send("spammer", "test", "subject", "body");
-end)
diff --git a/test/test_mod/mod.conf b/test/test_mod/mod.conf
deleted file mode 100644
index be6fbfb..0000000
--- a/test/test_mod/mod.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-name = mail_test
-depends = mail
diff --git a/test/world.mt b/test/world.mt
index 8ee1a08..f03d6e6 100644
--- a/test/world.mt
+++ b/test/world.mt
@@ -1,6 +1,9 @@
-enable_damage = true
-creative_mode = false
-gameid = minetest
+enable_damage = false
+creative_mode = true
+mod_storage_backend = sqlite3
 auth_backend = sqlite3
-backend = sqlite3
-player_backend = sqlite3
+player_backend = dummy
+backend = dummy
+gameid = minetest
+world_name = mapblock_lib
+server_announce = false