Merge pull request #6676 from jmchilton/pytest_fix

Tell pytest not to execute Python code in node_modules for web proxy.
galaxyproject · Sep 7, 2018 · 1ba4b47 · 1ba4b47
2 parents 3824a89 + 69252d7
commit 1ba4b47
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/run_tests.sh b/run_tests.sh
@@ -510,7 +510,7 @@ do
       -u|-unit|--unit)
           report_file="run_unit_tests.html"
           test_script="pytest"
-          unit_extra='--doctest-modules --ignore lib/galaxy/webapps/tool_shed/controllers --ignore lib/galaxy/jobs/runners/chronos.py --ignore lib/galaxy/webapps/tool_shed/model/migrate --ignore lib/galaxy/util/jstree.py'
+          unit_extra='--doctest-modules --ignore lib/galaxy/web/proxy/js/node_modules/ --ignore lib/galaxy/webapps/tool_shed/controllers --ignore lib/galaxy/jobs/runners/chronos.py --ignore lib/galaxy/webapps/tool_shed/model/migrate --ignore lib/galaxy/util/jstree.py'
           if [ $# -gt 1 ]; then
               unit_extra="$unit_extra $2"
               shift 2