Fix run_test_wrapper to reflect Galaxy database isn't created with UTF8 encoding.

This commit is contained in:
John Chilton
2017-10-30 23:58:14 -04:00
parent 5f15889ca1
commit 459a9621e2
3 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -263,7 +263,7 @@ ensure_grunt_for_qunit() {
}
DOCKER_DEFAULT_IMAGE='galaxy/testing-base:18.01.3'
DOCKER_DEFAULT_IMAGE='galaxy/testing-base:18.01.4'
test_script="./scripts/functional_tests.py"
report_file="run_functional_tests.html"
-1
View File
@@ -60,7 +60,6 @@ ADD start_mysql.sh /opt/galaxy/start_mysql.sh
ADD ansible_vars.yml /tmp/ansible/ansible_vars.yml
ADD provision.yml /tmp/ansible/provision.yml
RUN mkdir /etc/galaxy && cd /tmp/ansible && mkdir roles && \
mkdir roles/galaxyprojectdotorg.galaxy-os && \
wget --quiet -O- https://github.com/galaxyproject/ansible-galaxy-os/archive/master.tar.gz | tar -xzf- --strip-components=1 -C roles/galaxyprojectdotorg.galaxy-os && \
+1
View File
@@ -41,6 +41,7 @@ then
GALAXY_TEST_INSTALL_DB_MERGED="true"
GALAXY_TEST_DBURI="postgres://root@localhost:5930/galaxy?client_encoding=utf8"
TOOL_SHED_TEST_DBURI="postgres://root@localhost:5930/toolshed?client_encoding=utf8"
export GALAXY_CONFIG_OVERRIDE_DATABASE_ENCODING="SQL_ASCII"
elif [ "$GALAXY_TEST_DATABASE_TYPE" = "mysql" ];
then
sh /opt/galaxy/start_mysql.sh