diff --git a/sbroad-cartridge/Makefile b/sbroad-cartridge/Makefile index 347d7c567f3ed81d9fb190615184bc15d95b21d9..ec80d43718b429ce7c16f1f5afe48cadd7d0ad32 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 63101d347e2ba9dc372e327bf98b14893a02940e..e4324168740dbab0e838e8420c9b6815ddb0d0d8 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 02202326d0ec74bb1b8e17f64920c22dc41f662c..bb4063aae8be8471fbfc7623c27829c59052531e 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 81a8eaf5634c9feaeb7d3dc5412198ccd51aa161..f01bf232a756277ecbce15ccf4e8d331bd03f024 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 3f7a2110464441bc1d79a1a59a74399eb9c73010..a0d87a7b0613d42ac644675611aa71515da6eed2 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 cf658195107deff174593392e9f02ab4158b8dbc..2a829a348152f2595c54b522dbc9c9ba36cb09fb 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 98fdd344d49ca335ed552a84be8c575ae873aa52..f9be0faa55dca3961aca29d5655ec0c8564741d5 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 bbf9e530a8006d34d124f5349bacf69cd049c258..f6a900686089e78a34f60a5dfe5cc826cb3abee0 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 4771a1c96de9298679424f4d8d1e2103705077b7..c5932b661f8b29b33136957f3c88eaf4790b2432 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 079c95a437b6d3da85e0dfc2bf7300bc7c31f2a8..2c44bc3e4c49664b9e6612aad267d252f914aa5d 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 fdf088ffcd22e754c13d2a2572432e146c14cffa..7d9ce739d681dbd0d7ff5bf0c0ffc8e51f867463 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 0ed70827e05e4076fc4a66325f63f9e4bfb4f383..1669d7b837351564951d1f0dbc82a48c73e834cf 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()