1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/757ede99b3de/ Changeset: 757ede99b3de User: inithello Date: 2014-01-13 21:23:23 Summary: Set the install and test wrapper script to only execute the repositories_with_tools tests if the previous tool_dependency_definitions test run completed. Affected #: 1 file diff -r e464ef370c194f730297a81592fa83d7dc59bdbc -r 757ede99b3dee051a9d41b61bbef6a1afaaae35c install_and_test_tool_shed_repositories.sh --- a/install_and_test_tool_shed_repositories.sh +++ b/install_and_test_tool_shed_repositories.sh @@ -45,18 +45,27 @@ test_tool_dependency_definitions () { # Test installation of repositories of type tool_dependency_definition. + if [ -f /ToolDepsTest/stage_1_complete ] ; then + rm /ToolDepsTest/stage_1_complete + fi python test/install_and_test_tool_shed_repositories/tool_dependency_definitions/functional_tests.py $* -v --with-nosehtml --html-report-file \ test/install_and_test_tool_shed_repositories/tool_dependency_definitions/run_functional_tests.html \ test/install_and_test_tool_shed_repositories/functional/test_install_repositories.py \ - test/functional/test_toolbox.py + test/functional/test_toolbox.py + touch /ToolDepsTest/stage_1_complete } test_repositories_with_tools () { + if [ ! -f /ToolDepsTest/stage_1_complete ] ; then + echo 'Stage 1 did not complete its run, exiting.' + exit 1 + fi # Test installation of repositories that contain valid tools with defined functional tests and a test-data directory containing test files. python test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py $* -v --with-nosehtml --html-report-file \ test/install_and_test_tool_shed_repositories/repositories_with_tools/run_functional_tests.html \ test/install_and_test_tool_shed_repositories/functional/test_install_repositories.py \ - test/functional/test_toolbox.py + test/functional/test_toolbox.py + rm /ToolDepsTest/stage_1_complete } which='both' Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.