Merge pull request #1083 from martenson/update-testing-docker-image

Update testing docker image
galaxyproject · Nov 16, 2015 · 727167b · 727167b
2 parents 51f8e21 + 7c863eb
commit 727167b
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/run_tests.sh b/run_tests.sh
@@ -43,7 +43,7 @@ Extra options:
  --xunit_report_file   Path of XUnit report to produce (for Python Galaxy functional tests).
  --skip-venv           Do not create .venv (passes this flag to common_startup.sh)
  --dockerize           Run tests in a pre-configured Docker container (must be first argument if present).
- --db <type>           For use with --dockerize, run tests using partially migrated 'postgres', 'mysql', 
+ --db <type>           For use with --dockerize, run tests using partially migrated 'postgres', 'mysql',
                        or 'sqlite' databases.
 EOF
 }
@@ -68,7 +68,7 @@ ensure_grunt() {
 }
 
 
-DOCKER_DEFAULT_IMAGE='galaxy/testing-base:15.10.1'
+DOCKER_DEFAULT_IMAGE='galaxy/testing-base:15.10.2'
 
 test_script="./scripts/functional_tests.py"
 report_file="run_functional_tests.html"
@@ -107,7 +107,7 @@ fi
 while :
 do
     case "$1" in
-      -h|--help|-\?) 
+      -h|--help|-\?)
           show_help
           exit 0
           ;;
@@ -119,19 +119,19 @@ do
           if [ $# -gt 1 ]; then
               test_id=$2;
               shift 2
-          else 
+          else
               echo "--id requires an argument" 1>&2
               exit 1
-          fi 
+          fi
           ;;
       -s|-sid|--sid)
           if [ $# -gt 1 ]; then
               section_id=$2
               shift 2
-          else 
+          else
               echo "--sid requires an argument" 1>&2
               exit 1
-          fi 
+          fi
           ;;
     -a|-api|--api)
           with_framework_test_tools_arg="-with_framework_test_tools"
@@ -165,7 +165,7 @@ do
               workflow_file=$2
               workflow_test=1
               shift 2
-          else 
+          else
               echo "--workflow requires an argument" 1>&2
               exit 1
           fi
@@ -204,7 +204,7 @@ do
           if [ $# -gt 1 ]; then
               report_file=$2
               shift 2
-          else 
+          else
               echo "--report_file requires an argument" 1>&2
               exit 1
           fi
@@ -251,13 +251,13 @@ do
           if [ $# -gt 1 ]; then
               unit_extra=$2
               shift 2
-          else 
+          else
               unit_extra='--exclude=functional --exclude="^get" --exclude=controllers --exclude=runners --exclude dictobj --exclude=jstree lib test/unit'
               shift 1
           fi
           ;;
       -q|-qunit|--qunit)
-          # Requires grunt installed and dependencies configured see 
+          # Requires grunt installed and dependencies configured see
           # test/qunit/README.txt for more information.
           driver="grunt"
           gruntfile="./test/qunit/Gruntfile.js"
@@ -294,11 +294,11 @@ do
           skip_common_startup=1
           shift
           ;;
-      --) 
+      --)
           shift
           break
           ;;
-      -*) 
+      -*)
           echo "invalid option: $1" 1>&2;
           show_help
           exit 1
@@ -347,7 +347,7 @@ elif [ -n "$casperjs_test" ]; then
         extra_args="test/casperjs/casperjs_runner.py"
     fi
 elif [ -n "$section_id" ]; then
-    extra_args=`python tool_list.py $section_id` 
+    extra_args=`python tool_list.py $section_id`
 elif [ -n "$test_id" ]; then
     class=":TestForTool_$test_id"
     extra_args="functional.test_toolbox$class"