2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/ceace0f609c0/ Changeset: ceace0f609c0 User: devteam Date: 2014-04-30 21:35:57 Summary: Moved API tests to live under test/ rather than test/functional/. Removed test for DNAse flanked genes. Added test for UCSC table browser. Affected #: 32 files This diff is so big that we needed to truncate the remainder. https://bitbucket.org/galaxy/galaxy-central/commits/c05ab2ae3a58/ Changeset: c05ab2ae3a58 User: devteam Date: 2014-04-30 21:43:21 Summary: Add options to the shell script wrappers to run the API tests. Affected #: 2 files diff -r ceace0f609c00b15a28b1737b8782beed92bd927 -r c05ab2ae3a58938e07c33193a7a52a89cbd43056 run_functional_tests.sh --- a/run_functional_tests.sh +++ b/run_functional_tests.sh @@ -10,6 +10,7 @@ echo "'run_functional_tests.sh aaa' for testing one test case of 'aaa' ('aaa' is the file name with path)" echo "'run_functional_tests.sh -id bbb' for testing one tool with id 'bbb' ('bbb' is the tool id)" echo "'run_functional_tests.sh -sid ccc' for testing one section with sid 'ccc' ('ccc' is the string after 'section::')" + echo "'run_functional_tests.sh -api' for running API functional tests" echo "'run_functional_tests.sh -list' for listing all the tool ids" echo "'run_functional_tests.sh -toolshed' for running all the test scripts in the ./test/tool_shed/functional directory" echo "'run_functional_tests.sh -toolshed testscriptname' for running one test script named testscriptname in the .test/tool_shed/functional directory" @@ -50,6 +51,12 @@ else python ./test/tool_shed/functional_tests.py -v --with-nosehtml --html-report-file ./test/tool_shed/run_functional_tests.html $2 fi +elif [ $1 = '-api' ]; then + if [ ! $2 ]; then + python ./scripts/functional_tests.py -v --with-nosehtml --html-report-file run_api_tests.html ./test/api + else + python ./scripts/functional_tests.py -v --with-nosehtml --html-report-file run_api_tests.html $2 + fi elif [ $1 = '-workflow' ]; then python ./scripts/functional_tests.py -v functional.workflow:WorkflowTestCase --with-nosehtml --html-report-file ./test/tool_shed/run_functional_tests.html -workflow $2 elif [ $1 = '-data_managers' ]; then diff -r ceace0f609c00b15a28b1737b8782beed92bd927 -r c05ab2ae3a58938e07c33193a7a52a89cbd43056 run_tests.sh --- a/run_tests.sh +++ b/run_tests.sh @@ -10,6 +10,7 @@ '${0##*/} -id bbb' for testing one tool with id 'bbb' ('bbb' is the tool id) '${0##*/} -sid ccc' for testing one section with sid 'ccc' ('ccc' is the string after 'section::') '${0##*/} -list' for listing all the tool ids +'${0##*/} -api' for running all the test scripts in the ./test/api directory '${0##*/} -toolshed' for running all the test scripts in the ./test/tool_shed/functional directory '${0##*/} -toolshed testscriptname' for running one test script named testscriptname in the .test/tool_shed/functional directory '${0##*/} -workflow test.xml' for running a workflow test case as defined by supplied workflow xml test file (experimental) @@ -65,6 +66,17 @@ exit 1 fi ;; + -a|-api|--api) + test_script="./scripts/functional_tests.py" + report_file="./run_api_tests.html" + if [ $# -gt 1 ]; then + api_script=$2 + shift 2 + else + api_script="./test/api" + shift 1 + fi + ;; -t|-toolshed|--toolshed) test_script="./test/tool_shed/functional_tests.py" report_file="./test/tool_shed/run_functional_tests.html" @@ -76,7 +88,7 @@ shift 1 fi ;; - -with_framework_test_tools|--with_framework_test_tools) + -with_framework_test_tools|--with_framework_test_tools) with_framework_test_tools_arg="-with_framework_test_tools" shift ;; @@ -182,6 +194,8 @@ extra_args="functional.workflow:WorkflowTestCase $workflow_file" elif [ -n "$toolshed_script" ]; then extra_args="$toolshed_script" +elif [ -n "$api_script" ]; then + extra_args="$api_script" elif [ -n "$section_id" ]; then extra_args=`python tool_list.py $section_id` elif [ -n "$test_id" ]; then 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.