Add django integration test again.

Author: viferga

source/scripts/python/frontend/CMakeLists.txt

@@ -41,7 +41,8 @@ set(target python-frontend-migrate)
 
 # Build frontend
 add_custom_target(${target} ALL
-	COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH="${CMAKE_CURRENT_BINARY_DIR};$ENV{PYTHONPATH}" ${PYTHON_EXECUTABLE} ${LOADER_SCRIPT_PATH}/manage.py migrate
+	COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH="${CMAKE_CURRENT_BINARY_DIR};$ENV{PYTHONPATH}" ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/source/manage.py migrate
+	WORKING_DIRECTORY ${LOADER_SCRIPT_PATH}
 	DEPENDS python-frontend
 )
 

source/scripts/python/frontend/source/manage.py

@@ -24,7 +24,11 @@ def frontend_execute(args):
 	execute_from_command_line(sys.argv)
 
 def frontend_initialize(port: int) -> int:
-	frontend_execute([os.path.abspath(__file__), 'runserver', str(port), '--noreload'])
+	try:
+		frontend_execute([os.path.abspath(__file__), 'runserver', str(port), '--noreload'])
+	except SystemExit as e:
+		print('Exit code:', e.code)
+		return e.code
 	return 0
 
 if __name__ == "__main__":

source/tests/CMakeLists.txt

@@ -107,7 +107,7 @@ add_subdirectory(detour_test)
 add_subdirectory(serial_test)
 add_subdirectory(configuration_test)
 add_subdirectory(py_loader_test)
-#add_subdirectory(py_django_integration_test) # TODO: Solve deadlock
+add_subdirectory(py_django_integration_test)
 add_subdirectory(py_loader_port_test)
 add_subdirectory(rb_loader_test)
 add_subdirectory(rb_loader_parser_test)

source/tests/py_django_integration_test/CMakeLists.txt

@@ -22,7 +22,7 @@ execute_process(
 )
 
 if("${PYTHON_DJANGO_FOUND}" EQUAL "1")
-	message(WARNING "Python Django not found, skipping the python djangi integration test project")
+	message(WARNING "Python Django not found, skipping the python django integration test")
 	return()
 endif()
 

source/tests/py_django_integration_test/data/test.py.in

@@ -16,7 +16,6 @@ import subprocess
 def sigint_handler(signal, frame):
 	print('Server: SIGINT signal from client to server (Ctrl-C)');
 
-
 class py_django_integration_test(unittest.TestCase):
 
 	def test_py_django_server(self):