From 3f7ef96f5fdc6826b2e54ed563ceb2c7261b33f9 Mon Sep 17 00:00:00 2001
From: "ms.evilhat" <ms.evilhat@gmail.com>
Date: Fri, 25 Nov 2022 11:45:04 +0300
Subject: [PATCH] feat(test_integration): run both test clusters
---
sbroad-cartridge/Makefile | 12 +++++++++++-
.../broken_cache_test.lua | 2 +-
.../test_app/test/integration/api_test.lua | 2 +-
.../test_app/test/integration/array_test.lua | 2 +-
.../test_app/test/integration/ddl_test.lua | 2 +-
.../test_app/test/integration/explain_test.lua | 2 +-
.../test_app/test/integration/insert_test.lua | 2 +-
.../test_app/test/integration/large_query_test.lua | 2 +-
.../test_app/test/integration/motion_test.lua | 2 +-
.../test_app/test/integration/operators_test.lua | 2 +-
.../test/integration/target_queries_test.lua | 2 +-
.../test/integration/validate_schema_test.lua | 2 +-
12 files changed, 22 insertions(+), 12 deletions(-)
rename sbroad-cartridge/test_app/test/{integration => configuration}/broken_cache_test.lua (97%)
diff --git a/sbroad-cartridge/Makefile b/sbroad-cartridge/Makefile
index 347d7c567f..ec80d43718 100644
--- a/sbroad-cartridge/Makefile
+++ b/sbroad-cartridge/Makefile
@@ -23,8 +23,18 @@ build_cartridge_engine_debug:
build_integration:
cartridge build $(TEST_APP)
+test_wo_replication:
+ cd $(TEST_APP) && rm -rf tmp/tarantool_integration.log && TARANTOOL_LOG_LEVEL=5 TARANTOOL_LOG=tmp/tarantool_integration.log ./.rocks/bin/luatest --coverage -v test/integration/ && cd ..
+
+test_w_replication:
+ cd $(TEST_APP) && rm -rf tmp/tarantool_configuration.log && TARANTOOL_LOG_LEVEL=5 TARANTOOL_LOG=tmp/tarantool_configuration.log ./.rocks/bin/luatest --coverage -v test/configuration/ && cd ..
+
run_integration:
- cd $(TEST_APP) && rm -rf tmp/tarantool.log && TARANTOOL_LOG_LEVEL=5 TARANTOOL_LOG=tmp/tarantool.log ./.rocks/bin/luatest --coverage -v test/ && cd ..
+ @$(MAKE) test_wo_replication;\
+ EXIT_CODE_1=$$?;\
+ $(MAKE) test_w_replication;\
+ EXIT_CODE_2=$$?;\
+ exit $$EXIT_CODE_1 && $$EXIT_CODE_2
install_debug:
mkdir -p $(LUADIR)/$(PROJECT_NAME)
diff --git a/sbroad-cartridge/test_app/test/integration/broken_cache_test.lua b/sbroad-cartridge/test_app/test/configuration/broken_cache_test.lua
similarity index 97%
rename from sbroad-cartridge/test_app/test/integration/broken_cache_test.lua
rename to sbroad-cartridge/test_app/test/configuration/broken_cache_test.lua
index 63101d347e..e432416874 100644
--- a/sbroad-cartridge/test_app/test/integration/broken_cache_test.lua
+++ b/sbroad-cartridge/test_app/test/configuration/broken_cache_test.lua
@@ -1,7 +1,7 @@
local t = require('luatest')
local g = t.group('broken_cache')
-local helper = require('test.helper')
+local helper = require('test.helper.cluster_async_replication')
local cluster = nil
g.before_all(
diff --git a/sbroad-cartridge/test_app/test/integration/api_test.lua b/sbroad-cartridge/test_app/test/integration/api_test.lua
index 02202326d0..bb4063aae8 100644
--- a/sbroad-cartridge/test_app/test/integration/api_test.lua
+++ b/sbroad-cartridge/test_app/test/integration/api_test.lua
@@ -1,7 +1,7 @@
local t = require('luatest')
local g = t.group('integration_api')
-local helper = require('test.helper')
+local helper = require('test.helper.cluster_no_replication')
local cluster = nil
g.before_all(
diff --git a/sbroad-cartridge/test_app/test/integration/array_test.lua b/sbroad-cartridge/test_app/test/integration/array_test.lua
index 81a8eaf563..f01bf232a7 100644
--- a/sbroad-cartridge/test_app/test/integration/array_test.lua
+++ b/sbroad-cartridge/test_app/test/integration/array_test.lua
@@ -1,6 +1,6 @@
local t = require('luatest')
local g = t.group('array_field')
-local helper = require('test.helper')
+local helper = require('test.helper.cluster_no_replication')
g.before_all(
function()
diff --git a/sbroad-cartridge/test_app/test/integration/ddl_test.lua b/sbroad-cartridge/test_app/test/integration/ddl_test.lua
index 3f7a211046..a0d87a7b06 100644
--- a/sbroad-cartridge/test_app/test/integration/ddl_test.lua
+++ b/sbroad-cartridge/test_app/test/integration/ddl_test.lua
@@ -1,7 +1,7 @@
local t = require('luatest')
local g = t.group('sbroad_with_ddl')
-local helper = require('test.helper')
+local helper = require('test.helper.cluster_no_replication')
local cluster = nil
g.before_all(
diff --git a/sbroad-cartridge/test_app/test/integration/explain_test.lua b/sbroad-cartridge/test_app/test/integration/explain_test.lua
index cf65819510..2a829a3481 100644
--- a/sbroad-cartridge/test_app/test/integration/explain_test.lua
+++ b/sbroad-cartridge/test_app/test/integration/explain_test.lua
@@ -1,7 +1,7 @@
local t = require('luatest')
local g = t.group('integration_api.explain')
-local helper = require('test.helper')
+local helper = require('test.helper.cluster_no_replication')
local cluster = nil
g.before_all(
diff --git a/sbroad-cartridge/test_app/test/integration/insert_test.lua b/sbroad-cartridge/test_app/test/integration/insert_test.lua
index 98fdd344d4..f9be0faa55 100644
--- a/sbroad-cartridge/test_app/test/integration/insert_test.lua
+++ b/sbroad-cartridge/test_app/test/integration/insert_test.lua
@@ -1,7 +1,7 @@
local t = require('luatest')
local g = t.group('integration_api.insert')
-local helper = require('test.helper')
+local helper = require('test.helper.cluster_no_replication')
local cluster = nil
g.before_all(
diff --git a/sbroad-cartridge/test_app/test/integration/large_query_test.lua b/sbroad-cartridge/test_app/test/integration/large_query_test.lua
index bbf9e530a8..f6a9006860 100644
--- a/sbroad-cartridge/test_app/test/integration/large_query_test.lua
+++ b/sbroad-cartridge/test_app/test/integration/large_query_test.lua
@@ -1,6 +1,6 @@
local t = require('luatest')
local g = t.group('data_query_test')
-local helper = require('test.helper')
+local helper = require('test.helper.cluster_no_replication')
local data = require('test.data.test_data')
g.before_all(
diff --git a/sbroad-cartridge/test_app/test/integration/motion_test.lua b/sbroad-cartridge/test_app/test/integration/motion_test.lua
index 4771a1c96d..c5932b661f 100644
--- a/sbroad-cartridge/test_app/test/integration/motion_test.lua
+++ b/sbroad-cartridge/test_app/test/integration/motion_test.lua
@@ -1,7 +1,7 @@
local t = require('luatest')
local g = t.group('integration_api.motion')
-local helper = require('test.helper')
+local helper = require('test.helper.cluster_no_replication')
local cluster = nil
g.before_all(
diff --git a/sbroad-cartridge/test_app/test/integration/operators_test.lua b/sbroad-cartridge/test_app/test/integration/operators_test.lua
index 079c95a437..2c44bc3e4c 100644
--- a/sbroad-cartridge/test_app/test/integration/operators_test.lua
+++ b/sbroad-cartridge/test_app/test/integration/operators_test.lua
@@ -1,7 +1,7 @@
local t = require('luatest')
local g = t.group('integration_api.operators')
-local helper = require('test.helper')
+local helper = require('test.helper.cluster_no_replication')
local cluster = nil
g.before_all(
diff --git a/sbroad-cartridge/test_app/test/integration/target_queries_test.lua b/sbroad-cartridge/test_app/test/integration/target_queries_test.lua
index fdf088ffcd..7d9ce739d6 100644
--- a/sbroad-cartridge/test_app/test/integration/target_queries_test.lua
+++ b/sbroad-cartridge/test_app/test/integration/target_queries_test.lua
@@ -1,7 +1,7 @@
local t = require('luatest')
local target_queries = t.group('target_queries')
-local helper = require('test.helper')
+local helper = require('test.helper.cluster_no_replication')
local cluster = nil
target_queries.before_all(
diff --git a/sbroad-cartridge/test_app/test/integration/validate_schema_test.lua b/sbroad-cartridge/test_app/test/integration/validate_schema_test.lua
index 0ed70827e0..1669d7b837 100644
--- a/sbroad-cartridge/test_app/test/integration/validate_schema_test.lua
+++ b/sbroad-cartridge/test_app/test/integration/validate_schema_test.lua
@@ -1,6 +1,6 @@
local t = require('luatest')
local g = t.group('schema_validate')
-local helper = require('test.helper')
+local helper = require('test.helper.cluster_no_replication')
g.before_all(
function()
--
GitLab