From d315b61034b1a674a0b6a0f76d4bef040403e03f Mon Sep 17 00:00:00 2001 From: BuckarooBanzay Date: Sun, 28 Mar 2021 21:30:03 +0200 Subject: [PATCH] update integration test stuff --- .gitmodules | 3 +++ pandorabox_custom | 2 +- pandorabox_integration_test | 1 + test-minetest.conf | 4 +++- test.sh | 2 +- 5 files changed, 9 insertions(+), 3 deletions(-) create mode 160000 pandorabox_integration_test diff --git a/.gitmodules b/.gitmodules index 0d14997..da3f309 100644 --- a/.gitmodules +++ b/.gitmodules @@ -547,3 +547,6 @@ [submodule "machine_parts"] path = machine_parts url = https://github.com/mt-mods/machine_parts.git +[submodule "pandorabox_integration_test"] + path = pandorabox_integration_test + url = https://github.com/pandorabox-io/pandorabox_integration_test.git diff --git a/pandorabox_custom b/pandorabox_custom index 195fba3..bbfba7a 160000 --- a/pandorabox_custom +++ b/pandorabox_custom @@ -1 +1 @@ -Subproject commit 195fba36bb4a27ce53b364382c04dd7f7c41d17c +Subproject commit bbfba7a1175e2612be7308a09a95fd1497719a51 diff --git a/pandorabox_integration_test b/pandorabox_integration_test new file mode 160000 index 0000000..6bdafb0 --- /dev/null +++ b/pandorabox_integration_test @@ -0,0 +1 @@ +Subproject commit 6bdafb0ee6114a0d94ce7f9edb26f63a59c737b1 diff --git a/test-minetest.conf b/test-minetest.conf index 675527b..3048d3c 100644 --- a/test-minetest.conf +++ b/test-minetest.conf @@ -1,10 +1,12 @@ # integration test settings enable_integration_test = true -enable_recipe_test = true +#enable_recipe_test = true areas.self_protection = true mesecon.luacontroller_lightweight_interrupts = true moreblocks.stairsplus_in_creative_inventory = false bridger_enable_trusses = true telemosaic_right_click_teleport = true + +secure.http_mods = monitoring,digistuff,blockexchange diff --git a/test.sh b/test.sh index db096ef..7582b42 100755 --- a/test.sh +++ b/test.sh @@ -7,6 +7,6 @@ docker run --rm -i \ -v $(pwd)/test-minetest.conf:/etc/minetest/minetest.conf \ -v /tmp/mt:/var/lib/minetest/.minetest \ -v $(pwd):/var/lib/minetest/.minetest/worlds/world/worldmods \ - registry.gitlab.com/minetest/minetest/server:5.3.0 + registry.gitlab.com/minetest/minetest/server:5.4.0 test -f /tmp/mt/worlds/world/integration_test.json && exit 0 || exit 1