altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Don't handle empty diff chunks

Browse source 
- Legacy-Id: 662
This commit is contained in:
Henrik Levkowetz 2007-06-26 19:22:30 +00:00
parent f245ccb875
commit 0f534e0242
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ietf/tests.py
View file

@ -14,7 +14,6 @@ from django.db import connection
from django.core import management
import ietf.urls
startup_database = settings.DATABASE_NAME # The startup database name, before changing to test_...
def run_tests(module_list, verbosity=1, extra_tests=[]):
@ -165,6 +164,7 @@ def module_setup(module):
module.patterns = [ pattern for pattern in module.patterns for prefix in module.prefixes if re.match(prefix, pattern) ]
module.testtuples = [ tuple for tuple in module.testtuples for prefix in module.prefixes if re.match(prefix, tuple[1][1:]) ]
# Use the default database for the url tests, instead of the test database
module.testdb = settings.DATABASE_NAME
connection.close()
@ -325,8 +325,9 @@ class UrlTestCase(TestCase):
difflist = list(unified_diff(goodtext, testtext, master, url, "", "", contextlines, lineterm=""))
diff = "\n".join(difflist)
for chunk in module.diffchunks:
while re.search(chunk, diff):
diff = re.sub(chunk, "", diff)
if chunk:
while re.search(chunk, diff):
diff = re.sub(chunk, "", diff)
if len(diff.strip().splitlines()) == 2:
# only the initial 2 lines of the diff remains --
# discard them too