From bfa6c51f86debe7ad0bd28bebd26cd51d2de2305 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 11 Feb 2016 03:08:10 -0400 Subject: [PATCH] Configure GitLab-CI mysql service to use UTF-8 and fix failing test in MySQL. --- .gitlab-ci.yml | 1 + HISTORY.rst | 1 + contrib/testing/gitlab-ci/database.yml.mysql | 10 ++++++++++ 3 files changed, 12 insertions(+) create mode 100644 contrib/testing/gitlab-ci/database.yml.mysql diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c7ed5587b6..ef03628d87 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,6 +15,7 @@ test:mysql: - pip install -r requirements/testing.txt - pip install -q mysql-python - apt-get install -qq mysql-client + - cp contrib/testing/gitlab-ci/database.yml.mysql config/database.yml - mysql -h"$MYSQL_PORT_3306_TCP_ADDR" -P"$MYSQL_PORT_3306_TCP_PORT" -uroot -p"$MYSQL_ENV_MYSQL_ROOT_PASSWORD" -e "ALTER DATABASE $MYSQL_DATABASE CHARACTER SET utf8 COLLATE utf8_unicode_ci;" - coverage run manage.py runtests --settings=mayan.settings.testing.gitlab-ci.db_mysql --nomigrations - bash <(curl https://raw.githubusercontent.com/codecov/codecov-bash/master/codecov) -t $CODECOV_TOKEN diff --git a/HISTORY.rst b/HISTORY.rst index 57fa9afa90..dda5d8df10 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -6,6 +6,7 @@ - Move metadata form value validation to .clean() and update field data may not be available yet when validatng the value field. Only validate form value if form has a metadata type associated. - Only extract validation error messages from ValidationError exception instances. - Don't store empty metadata value if the update checkbox is not checked. +- Add 2 second delay to document version tests to workaround MySQL not storing the millisecond part of the document version's timestamp. 2.0.1 (2016-01-22) ================== diff --git a/contrib/testing/gitlab-ci/database.yml.mysql b/contrib/testing/gitlab-ci/database.yml.mysql new file mode 100644 index 0000000000..78665e81f1 --- /dev/null +++ b/contrib/testing/gitlab-ci/database.yml.mysql @@ -0,0 +1,10 @@ +test: &test + adapter: mysql2 + collation: utf8_general_ci + database: gitlabhq_test + encoding: utf8 + password: + pool: 5 + reconnect: false + # socket: /tmp/mysql.sock + username: root