Skip to content

E
edx-platform
Commit d422cb92 by JonahStanley
Options

Fixed desired_capabilities issues 

Also, now lettuce browser can be specified by jenkins
parent ee23b9d1
Showing with 4 additions and 4 deletions
cms/envs/acceptance.py
...@@ -101,7 +101,7 @@ MITX_FEATURES['SAUCE'] = { ...@@ -101,7 +101,7 @@ MITX_FEATURES['SAUCE'] = {
'ENABLED' : os.environ.get('ENABLED'), 'ENABLED' : os.environ.get('ENABLED'),
'USERNAME' : os.environ.get('SAUCE_USER_NAME'), 'USERNAME' : os.environ.get('SAUCE_USER_NAME'),
'ACCESS_ID' : os.environ.get('SAUCE_API_KEY'), 'ACCESS_ID' : os.environ.get('SAUCE_API_KEY'),
'BROWSER' : DESIRED_CAPABILITIES.get(os.environ.get('SAUCE_BROWSER')), 'BROWSER' : DESIRED_CAPABILITIES.get(os.environ.get('SAUCE_BROWSER', 'chrome')),
'PLATFORM' : os.environ.get('SAUCE_PLATFORM'), 'PLATFORM' : os.environ.get('SAUCE_PLATFORM'),
'VERSION' : os.environ.get('SAUCE_VERSION'), 'VERSION' : os.environ.get('SAUCE_VERSION'),
'DEVICE' : os.environ.get('SAUCE_DEVICE'), 'DEVICE' : os.environ.get('SAUCE_DEVICE'),
...@@ -114,4 +114,4 @@ MITX_FEATURES['SAUCE'] = { ...@@ -114,4 +114,4 @@ MITX_FEATURES['SAUCE'] = {
INSTALLED_APPS += ('lettuce.django',) INSTALLED_APPS += ('lettuce.django',)
LETTUCE_APPS = ('contentstore',) LETTUCE_APPS = ('contentstore',)
LETTUCE_SERVER_PORT = choice(PORTS) LETTUCE_SERVER_PORT = choice(PORTS)
LETTUCE_BROWSER = 'chrome' LETTUCE_BROWSER = os.environ.get('LETTUCE_BROWSER', 'chrome')
lms/envs/acceptance.py
...@@ -109,7 +109,7 @@ MITX_FEATURES['SAUCE'] = { ...@@ -109,7 +109,7 @@ MITX_FEATURES['SAUCE'] = {
'ENABLED' : os.environ.get('ENABLED'), 'ENABLED' : os.environ.get('ENABLED'),
'USERNAME' : os.environ.get('SAUCE_USER_NAME'), 'USERNAME' : os.environ.get('SAUCE_USER_NAME'),
'ACCESS_ID' : os.environ.get('SAUCE_API_KEY'), 'ACCESS_ID' : os.environ.get('SAUCE_API_KEY'),
'BROWSER' : DESIRED_CAPABILITIES.get(os.environ.get('SAUCE_BROWSER')), 'BROWSER' : DESIRED_CAPABILITIES.get(os.environ.get('SAUCE_BROWSER', 'chrome')),
'PLATFORM' : os.environ.get('SAUCE_PLATFORM'), 'PLATFORM' : os.environ.get('SAUCE_PLATFORM'),
'VERSION' : os.environ.get('SAUCE_VERSION'), 'VERSION' : os.environ.get('SAUCE_VERSION'),
'DEVICE' : os.environ.get('SAUCE_DEVICE'), 'DEVICE' : os.environ.get('SAUCE_DEVICE'),
...@@ -122,4 +122,4 @@ MITX_FEATURES['SAUCE'] = { ...@@ -122,4 +122,4 @@ MITX_FEATURES['SAUCE'] = {
INSTALLED_APPS += ('lettuce.django',) INSTALLED_APPS += ('lettuce.django',)
LETTUCE_APPS = ('courseware',) LETTUCE_APPS = ('courseware',)
LETTUCE_SERVER_PORT = choice(PORTS) LETTUCE_SERVER_PORT = choice(PORTS)
LETTUCE_BROWSER = 'chrome' LETTUCE_BROWSER = os.environ.get('LETTUCE_BROWSER', 'chrome')
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