From 5928bd9faa42d38199e1ea0e5e8b2f8cc88b2a2f Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Tue, 28 Feb 2017 18:02:30 +0000
Subject: [PATCH] Added svn symlink check and creation to test setup.  Forced
 test settings to use an empty INTERNAL_IPS list for consistency in code
 coverage figures.  - Legacy-Id: 12929

---
 ietf/checks.py            | 21 +++++++++++++--------
 ietf/utils/test_runner.py |  6 ++++++
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ietf/checks.py b/ietf/checks.py
index 03b872719..cf2604005 100644
--- a/ietf/checks.py
+++ b/ietf/checks.py
@@ -261,15 +261,9 @@ def check_cache(app_configs, **kwargs):
             errors.append(cache_error("Cache didn't accept session cookie age", "E0016"))
     return errors
     
-@checks.register('cache')
-def check_svn_import(app_configs, **kwargs):
-    #
-    if already_ran():
-        return []
-    #
-    errors = []
-    # 
+def maybe_create_svn_symlinks(settings):
     site_packages_dir = None
+    errors = []
     for p in sys.path:
         if ('/env/' in p or '/venv/' in p) and '/site-packages' in p:
             site_packages_dir = p
@@ -289,6 +283,17 @@ def check_svn_import(app_configs, **kwargs):
                     hint = "Please provide the correct python system site-package paths for\n"
                     "svn and libsvn in SVN_PACKAGES.",
                     id = "datatracker.E0015",))
+    return errors
+
+@checks.register('cache')
+def check_svn_import(app_configs, **kwargs):
+    #
+    if already_ran():
+        return []
+    #
+    errors = []
+    # 
+    errors += maybe_create_svn_symlinks(settings)
     #
     if settings.SERVER_MODE == 'production':
         try:
diff --git a/ietf/utils/test_runner.py b/ietf/utils/test_runner.py
index 4a8b9136f..ed7e70e94 100644
--- a/ietf/utils/test_runner.py
+++ b/ietf/utils/test_runner.py
@@ -65,6 +65,7 @@ import ietf
 import ietf.utils.mail
 from ietf.utils.test_smtpserver import SMTPTestServerDriver
 from ietf.utils.test_utils import TestCase
+from ietf.checks import maybe_create_svn_symlinks
 
 loaded_templates = set()
 visited_urls = set()
@@ -423,6 +424,10 @@ class IetfTestRunner(DiscoverRunner):
             print("     Changing TEMPLATES[0]['OPTIONS']['string_if_invalid'] to '' during testing")
             settings.TEMPLATES[0]['OPTIONS']['string_if_invalid'] = ''
 
+        if settings.INTERNAL_IPS:
+            print "     Changing INTERNAL_IPS to '[]' during testing."
+            settings.INTERNAL_IPS = []
+
         assert not settings.IDTRACKER_BASE_URL.endswith('/')
 
         # Try to set up an SMTP test server.  In case other test runs are
@@ -439,6 +444,7 @@ class IetfTestRunner(DiscoverRunner):
             except socket.error:
                 pass
 
+        maybe_create_svn_symlinks(settings)
 
         super(IetfTestRunner, self).setup_test_environment(**kwargs)