diff --git a/.travis.yml b/.travis.yml index 7d50635db1..9a23c1dc73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ sudo: required addons: hosts: - test_site - - test_site_2 + - test_site_producer mariadb: 10.3 postgresql: 9.5 @@ -51,10 +51,10 @@ 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/.travis/$DB.json ~/frappe-bench/sites/test_site/site_config.json + - cp $TRAVIS_BUILD_DIR/.travis/consumer_db/$DB.json ~/frappe-bench/sites/test_site/site_config.json - - mkdir ~/frappe-bench/sites/test_site_2 - - cp $TRAVIS_BUILD_DIR/.travis/$DB.json ~/frappe-bench/sites/test_site_2/site_config.json + - mkdir ~/frappe-bench/sites/test_site_producer + - cp $TRAVIS_BUILD_DIR/.travis/producer_db/$DB.json ~/frappe-bench/sites/test_site_producer/site_config.json - mysql -u root -e "SET GLOBAL character_set_server = 'utf8mb4'" - mysql -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'" @@ -86,7 +86,7 @@ install: - bench start & - bench --site test_site reinstall --yes - - bench --site test_site_2 reinstall --yes + - bench --site test_site_producer reinstall --yes - bench build --app frappe after_script: diff --git a/.travis/mariadb.json b/.travis/consumer_db/mariadb.json similarity index 99% rename from .travis/mariadb.json rename to .travis/consumer_db/mariadb.json index 550ad94769..eb32a511c4 100644 --- a/.travis/mariadb.json +++ b/.travis/consumer_db/mariadb.json @@ -11,4 +11,4 @@ "root_login": "root", "root_password": "travis", "host_name": "http://test_site:8000" -} +} \ No newline at end of file diff --git a/.travis/postgres.json b/.travis/consumer_db/postgres.json similarity index 100% rename from .travis/postgres.json rename to .travis/consumer_db/postgres.json diff --git a/.travis/producer_db/mariadb.json b/.travis/producer_db/mariadb.json new file mode 100644 index 0000000000..11dfa087c2 --- /dev/null +++ b/.travis/producer_db/mariadb.json @@ -0,0 +1,14 @@ +{ + "db_host": "localhost", + "db_name": "test_frappe", + "db_password": "test_frappe", + "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_login": "root", + "root_password": "travis", + "host_name": "http://test_site_producer:8000" +} diff --git a/.travis/producer_db/postgres.json b/.travis/producer_db/postgres.json new file mode 100644 index 0000000000..b25cf6345e --- /dev/null +++ b/.travis/producer_db/postgres.json @@ -0,0 +1,14 @@ +{ + "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", + "host_name": "http://test_site_producer:8000" +} diff --git a/frappe/events_streaming/doctype/event_producer/test_event_producer.py b/frappe/events_streaming/doctype/event_producer/test_event_producer.py index e66c24b946..3e8679cd10 100644 --- a/frappe/events_streaming/doctype/event_producer/test_event_producer.py +++ b/frappe/events_streaming/doctype/event_producer/test_event_producer.py @@ -12,7 +12,7 @@ from frappe.events_streaming.doctype.event_producer.event_producer import pull_f def create_event_producer(): event_producer = frappe.new_doc('Event Producer') - event_producer.producer_url = 'http://test_site_2:8000' + event_producer.producer_url = 'http://test_site_producer:8000' event_producer.append('event_configuration', { 'ref_doctype': 'ToDo', 'use_same_name': 1 @@ -22,7 +22,7 @@ def create_event_producer(): class TestEventProducer(unittest.TestCase): def setUp(self): - if not frappe.db.exists('Event Producer', 'http://test_site_2:8000'): + if not frappe.db.exists('Event Producer', 'http://test_site_producer:8000'): create_event_producer() frappe.db.sql('delete from tabToDo') frappe.db.sql('delete from tabNote') @@ -130,7 +130,7 @@ class TestEventProducer(unittest.TestCase): def test_naming_configuration(self): #test with use_same_name = 0 frappe.clear_cache(doctype='ToDo') - event_producer = frappe.get_doc('Event Producer', 'http://test_site_2:8000') + event_producer = frappe.get_doc('Event Producer', 'http://test_site_producer:8000') event_producer.event_configuration = [] event_producer.append('event_configuration', { 'ref_doctype': 'ToDo' @@ -139,7 +139,7 @@ class TestEventProducer(unittest.TestCase): producer = get_remote_site() producer_doc = self.insert_into_producer(producer, 'test different name sync') self.pull_producer_data() - self.assertTrue(frappe.db.exists('ToDo', {'remote_docname': producer_doc.name, 'remote_site_name': 'http://test_site_2:8000'})) + self.assertTrue(frappe.db.exists('ToDo', {'remote_docname': producer_doc.name, 'remote_site_name': 'http://test_site_producer:8000'})) def test_update_log(self): self.subscribe_to_doctypes(['ToDo']) @@ -157,7 +157,7 @@ class TestEventProducer(unittest.TestCase): def subscribe_to_doctypes(self, doctypes): frappe.clear_cache(doctype='ToDo') - event_producer = frappe.get_doc('Event Producer', 'http://test_site_2:8000') + event_producer = frappe.get_doc('Event Producer', 'http://test_site_producer:8000') event_producer.event_configuration = [] for d in doctypes: event_producer.append('event_configuration', { @@ -172,7 +172,7 @@ class TestEventProducer(unittest.TestCase): return producer.insert(todo) def pull_producer_data(self): - pull_from_node('http://test_site_2:8000') + pull_from_node('http://test_site_producer:8000') time.sleep(1) def make_email_account_in_producer(producer, name, email_id): @@ -190,7 +190,7 @@ def make_email_account_in_producer(producer, name, email_id): return producer.insert(doc) def get_remote_site(): - producer_doc = frappe.get_doc('Event Producer', 'http://test_site_2:8000') + producer_doc = frappe.get_doc('Event Producer', 'http://test_site_producer:8000') producer_site = FrappeClient( url=producer_doc.producer_url, api_key=producer_doc.api_key,