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

Merge pull request #15574 from edx/jmbowman/PLAT-1619

Browse Source 
PLAT-1619 karma and bok-choy Docker Devstack fixes
This commit is contained in:
Jeremy Bowman
2017-07-18 15:04:02 -04:00
committed by GitHub
parent da931349d5 309ec0ac86
commit dfca1fa2fa
5 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/test/acceptance/tests/helpers.py
View File

@@ -462,7 +462,8 @@ class EventsTestMixin(TestCase):
"""
def setUp(self):
super(EventsTestMixin, self).setUp()
self.event_collection = MongoClient()["test"]["events"]
mongo_host = 'edx.devstack.mongo' if 'BOK_CHOY_HOSTNAME' in os.environ else 'localhost'
self.event_collection = MongoClient(mongo_host)["test"]["events"]
self.start_time = datetime.now()
def reset_event_tracking(self):
@@ -735,8 +736,9 @@ class AcceptanceTest(WebAppTest):
"""
def __init__(self, *args, **kwargs):
# Hack until we upgrade Firefox and install geckodriver in devstack and Jenkins
DesiredCapabilities.FIREFOX['marionette'] = False
if 'BOK_CHOY_HOSTNAME' not in os.environ:
# Hack until we upgrade Firefox and install geckodriver in Vagrant and Jenkins
DesiredCapabilities.FIREFOX['marionette'] = False
super(AcceptanceTest, self).__init__(*args, **kwargs)
# Use long messages so that failures show actual and expected values