Commit 0bd1e78e by JonahStanley

Acceptance tests use random ports

parent a21303ba
...@@ -9,7 +9,7 @@ import random ...@@ -9,7 +9,7 @@ import random
import os import os
TEST_ROOT = settings.COMMON_TEST_DATA_ROOT TEST_ROOT = settings.COMMON_TEST_DATA_ROOT
HTTP_PREFIX = "http://localhost:8001" HTTP_PREFIX = "http://localhost:%s" % settings.LETTUCE_SERVER_PORT
@step(u'I go to the files and uploads page') @step(u'I go to the files and uploads page')
......
...@@ -17,6 +17,7 @@ DEBUG = True ...@@ -17,6 +17,7 @@ DEBUG = True
import logging import logging
logging.disable(logging.ERROR) logging.disable(logging.ERROR)
import os import os
import random
def seed(): def seed():
...@@ -74,5 +75,5 @@ DATABASES = { ...@@ -74,5 +75,5 @@ DATABASES = {
# Include the lettuce app for acceptance testing, including the 'harvest' django-admin command # Include the lettuce app for acceptance testing, including the 'harvest' django-admin command
INSTALLED_APPS += ('lettuce.django',) INSTALLED_APPS += ('lettuce.django',)
LETTUCE_APPS = ('contentstore',) LETTUCE_APPS = ('contentstore',)
LETTUCE_SERVER_PORT = 8001 LETTUCE_SERVER_PORT = random.randint(1024, 65535)
LETTUCE_BROWSER = 'chrome' LETTUCE_BROWSER = 'chrome'
...@@ -17,6 +17,7 @@ DEBUG = True ...@@ -17,6 +17,7 @@ DEBUG = True
import logging import logging
logging.disable(logging.ERROR) logging.disable(logging.ERROR)
import os import os
import random
def seed(): def seed():
...@@ -64,7 +65,7 @@ DATABASES = { ...@@ -64,7 +65,7 @@ DATABASES = {
# Set up XQueue information so that the lms will send # Set up XQueue information so that the lms will send
# requests to a mock XQueue server running locally # requests to a mock XQueue server running locally
XQUEUE_PORT = 8027 XQUEUE_PORT = random.randint(1024, 65535)
XQUEUE_INTERFACE = { XQUEUE_INTERFACE = {
"url": "http://127.0.0.1:%d" % XQUEUE_PORT, "url": "http://127.0.0.1:%d" % XQUEUE_PORT,
"django_auth": { "django_auth": {
...@@ -81,4 +82,5 @@ MITX_FEATURES['STUB_VIDEO_FOR_TESTING'] = True ...@@ -81,4 +82,5 @@ MITX_FEATURES['STUB_VIDEO_FOR_TESTING'] = True
# Include the lettuce app for acceptance testing, including the 'harvest' django-admin command # Include the lettuce app for acceptance testing, including the 'harvest' django-admin command
INSTALLED_APPS += ('lettuce.django',) INSTALLED_APPS += ('lettuce.django',)
LETTUCE_APPS = ('courseware',) LETTUCE_APPS = ('courseware',)
LETTUCE_SERVER_PORT = random.randint(1024, 65535)
LETTUCE_BROWSER = 'chrome' 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