From ab46cd21bbe45da45ff95f333037c07bf65f915d Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Tue, 23 Jul 2019 19:15:02 +0530 Subject: [PATCH] fix(travis): Remove unused files --- .travis.yml | 2 +- {test_sites => .travis}/mariadb.json | 0 {test_sites => .travis}/postgres.json | 0 test_sites/apps.txt | 0 test_sites/test_site/site_config.json | 12 ------------ test_sites/test_site_postgres/site_config.json | 15 --------------- test_sites/test_site_ui/site_config.json | 14 -------------- 7 files changed, 1 insertion(+), 42 deletions(-) rename {test_sites => .travis}/mariadb.json (100%) rename {test_sites => .travis}/postgres.json (100%) delete mode 100644 test_sites/apps.txt delete mode 100644 test_sites/test_site/site_config.json delete mode 100644 test_sites/test_site_postgres/site_config.json delete mode 100644 test_sites/test_site_ui/site_config.json diff --git a/.travis.yml b/.travis.yml index 6ee1d541d4..200d09365c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,7 +53,7 @@ install: - bench init frappe-bench --skip-assets --python $(which python) --frappe-path $TRAVIS_BUILD_DIR - mkdir ~/frappe-bench/sites/test_site - - cp $TRAVIS_BUILD_DIR/test_sites/$DB.json ~/frappe-bench/sites/test_site/site_config.json + - cp $TRAVIS_BUILD_DIR/.travis/$DB.json ~/frappe-bench/sites/test_site/site_config.json - mysql -u root -e "SET GLOBAL character_set_server = 'utf8mb4'" - mysql -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'" diff --git a/test_sites/mariadb.json b/.travis/mariadb.json similarity index 100% rename from test_sites/mariadb.json rename to .travis/mariadb.json diff --git a/test_sites/postgres.json b/.travis/postgres.json similarity index 100% rename from test_sites/postgres.json rename to .travis/postgres.json diff --git a/test_sites/apps.txt b/test_sites/apps.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test_sites/test_site/site_config.json b/test_sites/test_site/site_config.json deleted file mode 100644 index 40a2d62b6d..0000000000 --- a/test_sites/test_site/site_config.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "db_name": "test_frappe", - "db_password": "test_frappe", - "auto_email_id": "test@example.com", - "mail_server": "smtp.example.com", - "mail_login": "test@example.com", - "mail_password": "test", - "admin_password": "admin", - "root_password": "travis", - "run_selenium_tests": 1, - "host_name": "http://test_site:8000" -} diff --git a/test_sites/test_site_postgres/site_config.json b/test_sites/test_site_postgres/site_config.json deleted file mode 100644 index 5f00580c53..0000000000 --- a/test_sites/test_site_postgres/site_config.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "db_host": "localhost", - "db_name": "test_frappe", - "db_password": "test_frappe", - "db_type": "postgres", - "auto_email_id": "test@example.com", - "mail_server": "smtp.example.com", - "mail_login": "test@example.com", - "mail_password": "test", - "admin_password": "admin", - "root_login": "postgres", - "root_password": "travis", - "run_selenium_tests": 1, - "host_name": "http://test_site_postgres:8000" -} diff --git a/test_sites/test_site_ui/site_config.json b/test_sites/test_site_ui/site_config.json deleted file mode 100644 index d233a6b553..0000000000 --- a/test_sites/test_site_ui/site_config.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "developer_mode": 1, - "db_name": "test_site_ui", - "db_password": "test_site_ui", - "db_type": "mariadb", - "auto_email_id": "test@example.com", - "mail_server": "smtp.example.com", - "mail_login": "test@example.com", - "mail_password": "test", - "admin_password": "admin", - "root_password": "travis", - "run_selenium_tests": 1, - "host_name": "http://test_site_ui:8000" -}