From c462e63adbc953bc04bdd0d4db85fe6e2bb1fadc Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Wed, 12 Nov 2014 01:45:58 +0000
Subject: [PATCH] Added settings for the PhantomJS ghostdriver.log and the
temporary meeting materials directory used during testing, so that it's
possible to place them in other places than the working copy. - Legacy-Id:
8646
---
ietf/meeting/tests_js.py | 2 +-
ietf/meeting/tests_views.py | 2 +-
ietf/settings.py | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ietf/meeting/tests_js.py b/ietf/meeting/tests_js.py
index 2fe4f92db..9221b8a44 100644
--- a/ietf/meeting/tests_js.py
+++ b/ietf/meeting/tests_js.py
@@ -32,7 +32,7 @@ def condition_data():
class ScheduleEditTests(LiveServerTestCase):
def setUp(self):
condition_data()
- self.driver = webdriver.PhantomJS()
+ self.driver = webdriver.PhantomJS(service_log_path=settings.TEST_GHOSTDRIVER_LOG_PATH)
self.driver.set_window_size(1024,768)
def debugSnapshot(self,filename='debug_this.png'):
diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py
index 14e3f99b8..736c18ff4 100644
--- a/ietf/meeting/tests_views.py
+++ b/ietf/meeting/tests_views.py
@@ -15,7 +15,7 @@ from ietf.utils.test_utils import TestCase
class MeetingTests(TestCase):
def setUp(self):
- self.materials_dir = os.path.abspath("tmp-meeting-materials-dir")
+ self.materials_dir = os.path.abspath(settings.TEST_MATERIALS_DIR)
if not os.path.exists(self.materials_dir):
os.mkdir(self.materials_dir)
settings.AGENDA_PATH = self.materials_dir
diff --git a/ietf/settings.py b/ietf/settings.py
index a9b2f9383..0c9f752e3 100644
--- a/ietf/settings.py
+++ b/ietf/settings.py
@@ -262,6 +262,10 @@ GLOBAL_TEST_FIXTURES = [ 'names','ietf.utils.test_data.make_immutable_base_data'
TEST_DIFF_FAILURE_DIR = "/tmp/test/failure/"
+TEST_GHOSTDRIVER_LOG_PATH = "ghostdriver.log"
+
+TEST_MATERIALS_DIR = "tmp-meeting-materials-dir"
+
# WG Chair configuration
MAX_WG_DELEGATES = 3