diff --git a/Jenkinsfile b/Jenkinsfile index 4f755dcae2..35f07d3987 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -52,10 +52,48 @@ parallel_nodes(['linux && cura', 'windows && cura']) { // Try and run the unit tests. If this stage fails, we consider the build to be "unstable". stage('Unit Test') { - try { + if (isUnix()) { + // For Linux to show everything + def branch = env.BRANCH_NAME + if(!fileExists("${env.CURA_ENVIRONMENT_PATH}/${branch}")) { + branch = "master" + } + def uranium_dir = get_workspace_dir("Ultimaker/Uranium/${branch}") + + try { + sh """ + cd .. + export PYTHONPATH=.:"${uranium_dir}" + ${env.CURA_ENVIRONMENT_PATH}/${branch}/bin/pytest -x --verbose --full-trace --capture=no ./tests + """ + } catch(e) { + currentBuild.result = "UNSTABLE" + } + } + else { + // For Windows make('test') - } catch(e) { - currentBuild.result = "UNSTABLE" + } + } + + stage('Code Style') { + if (isUnix()) { + // For Linux to show everything + def branch = env.BRANCH_NAME + if(!fileExists("${env.CURA_ENVIRONMENT_PATH}/${branch}")) { + branch = "master" + } + def uranium_dir = get_workspace_dir("Ultimaker/Uranium/${branch}") + + try { + sh """ + cd .. + export PYTHONPATH=.:"${uranium_dir}" + ${env.CURA_ENVIRONMENT_PATH}/${branch}/bin/python3 run_mypy.py + """ + } catch(e) { + currentBuild.result = "UNSTABLE" + } } } } diff --git a/cmake/CuraTests.cmake b/cmake/CuraTests.cmake index 801f054bc3..30794ed608 100644 --- a/cmake/CuraTests.cmake +++ b/cmake/CuraTests.cmake @@ -34,7 +34,7 @@ function(cura_add_test) if (NOT ${test_exists}) add_test( NAME ${_NAME} - COMMAND ${PYTHON_EXECUTABLE} -m pytest --junitxml=${CMAKE_BINARY_DIR}/junit-${_NAME}.xml ${_DIRECTORY} + COMMAND ${PYTHON_EXECUTABLE} -m pytest --verbose --full-trace --capture=no --no-print-log --junitxml=${CMAKE_BINARY_DIR}/junit-${_NAME}.xml ${_DIRECTORY} ) set_tests_properties(${_NAME} PROPERTIES ENVIRONMENT LANG=C) set_tests_properties(${_NAME} PROPERTIES ENVIRONMENT "PYTHONPATH=${_PYTHONPATH}")