Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18511 from edx/jmbowman/TE-2630

Browse Source 
TE-2630 Fix discussions bok-choy tests in devstack
This commit is contained in:
Jeremy Bowman
2018-07-05 11:06:38 -04:00
committed by GitHub
parent 8216fccb63 b74131a726
commit 127b1049ff
5 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/envs/bok_choy_docker.env.json
View File

@@ -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",

2
cms/envs/bok_choy_docker.py
View File

@@ -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',

2
common/test/acceptance/fixtures/__init__.py
View File

@@ -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')

2
lms/envs/bok_choy_docker.env.json
View File

@@ -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",

2
lms/envs/bok_choy_docker.py
View File

@@ -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',