Commit 2812b9cd by JonahStanley

Fixed how config was obtained

Added comment about the feature
parent 682d85c2
...@@ -81,6 +81,7 @@ MITX_FEATURES['AUTOMATIC_AUTH_FOR_TESTING'] = True ...@@ -81,6 +81,7 @@ MITX_FEATURES['AUTOMATIC_AUTH_FOR_TESTING'] = True
# We do not yet understand why this occurs. Setting this to true is a stopgap measure # We do not yet understand why this occurs. Setting this to true is a stopgap measure
USE_I18N = True USE_I18N = True
# Information needed to utilize Sauce Labs.
MITX_FEATURES['SAUCE'] = { MITX_FEATURES['SAUCE'] = {
'USE' : False, 'USE' : False,
'USERNAME' : '<USERNAME>', 'USERNAME' : '<USERNAME>',
......
...@@ -50,10 +50,12 @@ try: ...@@ -50,10 +50,12 @@ try:
except ImportError: except ImportError:
import simplejson as json import simplejson as json
config = {"username": settings.MITX_FEATURES.get('SAUCE_USERNAME'),
"access-key": settings.MITX_FEATURES.get('SAUCE_ACCESS_ID')}
SAUCE = settings.MITX_FEATURES.get('SAUCE', {}) SAUCE = settings.MITX_FEATURES.get('SAUCE', {})
config = {"username": SAUCE.get('USERNAME'),
"access-key": SAUCE.get('ACCESS_ID')}
desired_capabilities = SAUCE.get('BROWSER', DesiredCapabilities.CHROME) desired_capabilities = SAUCE.get('BROWSER', DesiredCapabilities.CHROME)
desired_capabilities['platform'] = SAUCE.get('PLATFORM', 'Linux') desired_capabilities['platform'] = SAUCE.get('PLATFORM', 'Linux')
desired_capabilities['version'] = SAUCE.get('VERSION', '') desired_capabilities['version'] = SAUCE.get('VERSION', '')
......
...@@ -89,6 +89,7 @@ MITX_FEATURES['AUTOMATIC_AUTH_FOR_TESTING'] = True ...@@ -89,6 +89,7 @@ MITX_FEATURES['AUTOMATIC_AUTH_FOR_TESTING'] = True
# We do not yet understand why this occurs. Setting this to true is a stopgap measure # We do not yet understand why this occurs. Setting this to true is a stopgap measure
USE_I18N = True USE_I18N = True
# Information needed to utilize Sauce Labs.
MITX_FEATURES['SAUCE'] = { MITX_FEATURES['SAUCE'] = {
'USE' : False, 'USE' : False,
'USERNAME' : '<USERNAME>', 'USERNAME' : '<USERNAME>',
...@@ -98,7 +99,7 @@ MITX_FEATURES['SAUCE'] = { ...@@ -98,7 +99,7 @@ MITX_FEATURES['SAUCE'] = {
'VERSION' : '', 'VERSION' : '',
'DEVICE' : '', 'DEVICE' : '',
'SESSION' : 'Lettuce Tests', 'SESSION' : 'Lettuce Tests',
'BUILD' : 'CMS TESTS', 'BUILD' : 'LMS TESTS',
'TAGS' : '' 'TAGS' : ''
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment