From b74131a726548449149216c794abc2ebb4b52742 Mon Sep 17 00:00:00 2001 From: Jeremy Bowman Date: Tue, 3 Jul 2018 14:33:54 -0400 Subject: [PATCH] TE-2630 Fix discussions bok-choy tests in devstack --- cms/envs/bok_choy_docker.env.json | 2 +- cms/envs/bok_choy_docker.py | 2 ++ common/test/acceptance/fixtures/__init__.py | 2 +- lms/envs/bok_choy_docker.env.json | 2 +- lms/envs/bok_choy_docker.py | 2 ++ 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cms/envs/bok_choy_docker.env.json b/cms/envs/bok_choy_docker.env.json index 9191f3eef7..540b4263d0 100644 --- a/cms/envs/bok_choy_docker.env.json +++ b/cms/envs/bok_choy_docker.env.json @@ -55,7 +55,7 @@ } }, "COMMENTS_SERVICE_KEY": "password", - "COMMENTS_SERVICE_URL": "http://edx.devstack.forum:4567", + "COMMENTS_SERVICE_URL": "http://edx.devstack.studio:4567", "CONTACT_EMAIL": "info@example.com", "DEFAULT_FEEDBACK_EMAIL": "feedback@example.com", "DEFAULT_FROM_EMAIL": "registration@example.com", diff --git a/cms/envs/bok_choy_docker.py b/cms/envs/bok_choy_docker.py index cd09b6e95a..48e8e2d6ab 100644 --- a/cms/envs/bok_choy_docker.py +++ b/cms/envs/bok_choy_docker.py @@ -10,6 +10,8 @@ CMS_BASE = '{}:{}'.format(os.environ['BOK_CHOY_HOSTNAME'], os.environ['BOK_CHOY_ LMS_BASE = '{}:{}'.format(os.environ['BOK_CHOY_HOSTNAME'], os.environ['BOK_CHOY_LMS_PORT']) LMS_ROOT_URL = 'http://{}'.format(LMS_BASE) +COMMENTS_SERVICE_URL = 'http://{}:4567'.format(os.environ['BOK_CHOY_HOSTNAME']) + # Docker does not support the syslog socket at /dev/log. Rely on the console. LOGGING['handlers']['local'] = LOGGING['handlers']['tracking'] = { 'class': 'logging.NullHandler', diff --git a/common/test/acceptance/fixtures/__init__.py b/common/test/acceptance/fixtures/__init__.py index 4e4065ba45..c3135db021 100644 --- a/common/test/acceptance/fixtures/__init__.py +++ b/common/test/acceptance/fixtures/__init__.py @@ -18,7 +18,7 @@ XQUEUE_STUB_URL = os.environ.get('xqueue_url', 'http://localhost:8040') ORA_STUB_URL = os.environ.get('ora_url', 'http://localhost:8041') # Get the URL of the comments service stub used in the test -COMMENTS_STUB_URL = os.environ.get('comments_url', 'http://localhost:4567') +COMMENTS_STUB_URL = os.environ.get('comments_url', 'http://{}:4567'.format(HOSTNAME)) # Get the URL of the EdxNotes service stub used in the test EDXNOTES_STUB_URL = os.environ.get('edxnotes_url', 'http://localhost:8042') diff --git a/lms/envs/bok_choy_docker.env.json b/lms/envs/bok_choy_docker.env.json index 9ca40f6fcc..713ce3d22f 100644 --- a/lms/envs/bok_choy_docker.env.json +++ b/lms/envs/bok_choy_docker.env.json @@ -55,7 +55,7 @@ } }, "COMMENTS_SERVICE_KEY": "password", - "COMMENTS_SERVICE_URL": "http://edx.devstack.forum:4567", + "COMMENTS_SERVICE_URL": "http://edx.devstack.lms:4567", "CONTACT_EMAIL": "info@example.com", "DEFAULT_FEEDBACK_EMAIL": "feedback@example.com", "DEFAULT_FROM_EMAIL": "registration@example.com", diff --git a/lms/envs/bok_choy_docker.py b/lms/envs/bok_choy_docker.py index cd09b6e95a..48e8e2d6ab 100644 --- a/lms/envs/bok_choy_docker.py +++ b/lms/envs/bok_choy_docker.py @@ -10,6 +10,8 @@ CMS_BASE = '{}:{}'.format(os.environ['BOK_CHOY_HOSTNAME'], os.environ['BOK_CHOY_ LMS_BASE = '{}:{}'.format(os.environ['BOK_CHOY_HOSTNAME'], os.environ['BOK_CHOY_LMS_PORT']) LMS_ROOT_URL = 'http://{}'.format(LMS_BASE) +COMMENTS_SERVICE_URL = 'http://{}:4567'.format(os.environ['BOK_CHOY_HOSTNAME']) + # Docker does not support the syslog socket at /dev/log. Rely on the console. LOGGING['handlers']['local'] = LOGGING['handlers']['tracking'] = { 'class': 'logging.NullHandler',