From 2812b9cd5c5ad2834518f72a76b40ea63d542044 Mon Sep 17 00:00:00 2001 From: JonahStanley Date: Tue, 13 Aug 2013 11:36:45 -0400 Subject: [PATCH] Fixed how config was obtained Added comment about the feature --- cms/envs/acceptance.py | 1 + common/djangoapps/terrain/browser.py | 6 ++++-- lms/envs/acceptance.py | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cms/envs/acceptance.py b/cms/envs/acceptance.py index 54407a8c2f..94d6d7697a 100644 --- a/cms/envs/acceptance.py +++ b/cms/envs/acceptance.py @@ -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 USE_I18N = True +# Information needed to utilize Sauce Labs. MITX_FEATURES['SAUCE'] = { 'USE' : False, 'USERNAME' : '', diff --git a/common/djangoapps/terrain/browser.py b/common/djangoapps/terrain/browser.py index 2757a2fa79..b92354e755 100644 --- a/common/djangoapps/terrain/browser.py +++ b/common/djangoapps/terrain/browser.py @@ -50,10 +50,12 @@ try: except ImportError: 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', {}) + +config = {"username": SAUCE.get('USERNAME'), +"access-key": SAUCE.get('ACCESS_ID')} + desired_capabilities = SAUCE.get('BROWSER', DesiredCapabilities.CHROME) desired_capabilities['platform'] = SAUCE.get('PLATFORM', 'Linux') desired_capabilities['version'] = SAUCE.get('VERSION', '') diff --git a/lms/envs/acceptance.py b/lms/envs/acceptance.py index 3689b0a18d..e9b7163d24 100644 --- a/lms/envs/acceptance.py +++ b/lms/envs/acceptance.py @@ -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 USE_I18N = True +# Information needed to utilize Sauce Labs. MITX_FEATURES['SAUCE'] = { 'USE' : False, 'USERNAME' : '', @@ -98,7 +99,7 @@ MITX_FEATURES['SAUCE'] = { 'VERSION' : '', 'DEVICE' : '', 'SESSION' : 'Lettuce Tests', - 'BUILD' : 'CMS TESTS', + 'BUILD' : 'LMS TESTS', 'TAGS' : '' }