Port from tap to luatest

tarantool · Oct 4, 2019 · 549058d · 549058d
1 parent 4ffd696
commit 549058d
Show file tree

Hide file tree

Showing 6 changed files with 697 additions and 718 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,7 +21,7 @@ enable_testing()
 set (LUA_PATH "LUA_PATH=${PROJECT_SOURCE_DIR}/?.lua\\;${PROJECT_SOURCE_DIR}/?/init.lua\\;\\;")
 set (LUA_SOURCE_DIR "LUA_SOURCE_DIR=${PROJECT_SOURCE_DIR}")
 
-add_test(http ${CMAKE_SOURCE_DIR}/test/http.test.lua)
+add_test(http ${CMAKE_SOURCE_DIR}/.rocks/bin/luatest)
 
 set_tests_properties(http PROPERTIES ENVIRONMENT "${LUA_PATH};${LUA_SOURCE_DIR}")
 

diff --git a/http-scm-1.rockspec b/http-scm-1.rockspec
@@ -11,7 +11,8 @@ description = {
 }
 dependencies = {
     'lua >= 5.1',
-    'checks >= 3.0.1'
+    'checks >= 3.0.1',
+    'luatest >= 0.2.2'
 }
 external_dependencies = {
     TARANTOOL = {

diff --git a/test/Procfile.test.nginx b/test/Procfile.test.nginx
@@ -1,2 +1,2 @@
 nginx: nginx -g "daemon off;" -c $PWD/test/nginx.conf
-nginx_tsgi_test: SERVER_TYPE=nginx ./test/http.test.lua 2>&1
+nginx_tsgi_test: SERVER_TYPE=nginx ./.rocks/bin/luatest 2>&1