All the tests will be run with make test

Author: edomora97

.travis.yml

@@ -118,7 +118,6 @@ script:
   - python build/python/setup.py install
   # run the tests
   - ( cd build && make test )
-  - ./run_tests.sh
 
 after_success:
   - ./build/cpp/manager -help

python/CMakeLists.txt

@@ -7,7 +7,7 @@ find_program(FIND_EXE NAMES find)
 # Sources
 file(GLOB SOURCES_PY "${CMAKE_CURRENT_SOURCE_DIR}/*.py")
 file(GLOB UIS_PY "${CMAKE_CURRENT_SOURCE_DIR}/uis/*.py")
-file(GLOB TESTS_PY "${CMAKE_CURRENT_SOURCE_DIR}/tests/*.py")
+file(GLOB TESTS_PY "${CMAKE_CURRENT_SOURCE_DIR}/tests/test.py" "${CMAKE_CURRENT_SOURCE_DIR}/tests/utils.py")
 file(GLOB TESTS_TASKS "${CMAKE_CURRENT_SOURCE_DIR}/tests/task_*")
 SET(REQUIREMENTS_TXT "${CMAKE_CURRENT_SOURCE_DIR}/requirements.txt")
 
@@ -35,7 +35,7 @@ string(REGEX REPLACE "[^;]*/" "${PROTOS_MODULE}/" PROTOS_PY_TGT "${PROTOS_PY}")
 string(REGEX REPLACE "[^;]*/" "${PROTOS_MODULE}/" GRPC_PY_TGT "${GRPC_PY}")
 string(REGEX REPLACE "${CMAKE_CURRENT_SOURCE_DIR}" "${SOURCES_MODULE}" SOURCES_PY_TGT "${SOURCES_PY}")
 string(REGEX REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/uis" "${UIS_MODULE}" UIS_PY_TGT "${UIS_PY}")
-string(REGEX REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/tests" "${UIS_MODULE}" TESTS_PY_TGT "${TESTS_PY}")
+string(REGEX REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/tests" "${TESTS_MODULE}" TESTS_PY_TGT "${TESTS_PY}")
 string(REGEX REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/tests" "${TESTS_MODULE}" TESTS_TASKS_TGT "${TESTS_TASKS}")
 SET(SETUP_PY ${CMAKE_CURRENT_BINARY_DIR}/setup.py)
 SET(REQUIREMENTS_TXT_TGT "${CMAKE_CURRENT_BINARY_DIR}/requirements.txt")
@@ -77,11 +77,18 @@ add_custom_command(OUTPUT ${REQUIREMENTS_TXT_TGT}
 )
 
 foreach(task ${TESTS_TASKS})
-  string(REGEX REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/tests" "${TESTS_MODULE}" task_dest "${task}")
-  add_custom_command(OUTPUT ${task_dest}
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${task} ${task_dest}
-    DEPENDS "${task}"
+  string(REGEX REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/tests/task_" "" task_name "${task}")
+  set(TEST_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tests")
+  set(TEST_DST_DIR "${TESTS_MODULE}")
+
+  add_custom_command(OUTPUT ${TEST_DST_DIR}/task_${task_name}
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${TEST_SRC_DIR}/task_${task_name} ${TEST_DST_DIR}/task_${task_name}
+    DEPENDS "${TEST_SRC_DIR}/task_${task_name}"
   )
+
+  file(COPY ${TEST_SRC_DIR}/${task_name}.py DESTINATION ${TEST_DST_DIR} FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ)
+
+  add_test(NAME pytest.${task_name} COMMAND env PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR} "${TEST_DST_DIR}/${task_name}.py")
 endforeach(task)
 
 add_custom_command(OUTPUT ${BIN_DIRECTORY}/server ${BIN_DIRECTORY}/worker ${BIN_DIRECTORY}/manager