diff --git a/.travis.yml b/.travis.yml index 9a23c1dc73..4d5452410c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,14 +59,24 @@ install: - mysql -u root -e "SET GLOBAL character_set_server = 'utf8mb4'" - mysql -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'" - - mysql -u root -e "CREATE DATABASE test_frappe" + - mysql -u root -e "CREATE DATABASE test_frappe_consumer" - mysql -u root -e "CREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe'" - mysql -u root -e "GRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost'" - mysql -u root -e "UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root'" - mysql -u root -e "FLUSH PRIVILEGES" - - psql -c "CREATE DATABASE test_frappe" -U postgres + - psql -c "CREATE DATABASE test_frappe_consumer" -U postgres + - psql -c "CREATE USER test_frappe WITH PASSWORD 'test_frappe'" -U postgres + + - mysql -u root -e "CREATE DATABASE test_frappe_producer" + - mysql -u root -e "CREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe'" + - mysql -u root -e "GRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost'" + + - mysql -u root -e "UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root'" + - mysql -u root -e "FLUSH PRIVILEGES" + + - psql -c "CREATE DATABASE test_frappe_producer" -U postgres - psql -c "CREATE USER test_frappe WITH PASSWORD 'test_frappe'" -U postgres - wget -O /tmp/wkhtmltox.tar.xz https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz diff --git a/.travis/consumer_db/mariadb.json b/.travis/consumer_db/mariadb.json index eb32a511c4..a7ea7b72af 100644 --- a/.travis/consumer_db/mariadb.json +++ b/.travis/consumer_db/mariadb.json @@ -1,6 +1,6 @@ { "db_host": "localhost", - "db_name": "test_frappe", + "db_name": "test_frappe_consumer", "db_password": "test_frappe", "db_type": "mariadb", "auto_email_id": "test@example.com", diff --git a/.travis/consumer_db/postgres.json b/.travis/consumer_db/postgres.json index 619dd91f10..cb82f44f66 100644 --- a/.travis/consumer_db/postgres.json +++ b/.travis/consumer_db/postgres.json @@ -1,6 +1,6 @@ { "db_host": "localhost", - "db_name": "test_frappe", + "db_name": "test_frappe_consumer", "db_password": "test_frappe", "db_type": "postgres", "auto_email_id": "test@example.com", diff --git a/.travis/producer_db/mariadb.json b/.travis/producer_db/mariadb.json index 11dfa087c2..8860241d80 100644 --- a/.travis/producer_db/mariadb.json +++ b/.travis/producer_db/mariadb.json @@ -1,6 +1,6 @@ { "db_host": "localhost", - "db_name": "test_frappe", + "db_name": "test_frappe_producer", "db_password": "test_frappe", "db_type": "mariadb", "auto_email_id": "test@example.com", diff --git a/.travis/producer_db/postgres.json b/.travis/producer_db/postgres.json index b25cf6345e..4d846eee98 100644 --- a/.travis/producer_db/postgres.json +++ b/.travis/producer_db/postgres.json @@ -1,6 +1,6 @@ { "db_host": "localhost", - "db_name": "test_frappe", + "db_name": "test_frappe_producer", "db_password": "test_frappe", "db_type": "postgres", "auto_email_id": "test@example.com",