diff --git a/ietf/tests.py b/ietf/tests.py index ea4cba93c..cbad9fba4 100644 --- a/ietf/tests.py +++ b/ietf/tests.py @@ -130,7 +130,7 @@ def module_setup(module): # find test urls module.testtuples = [] module.testurls = [] - module.diffchunks = [] + module.diffchunks = {} module.ignores = {} module.testtuples = get_testurls() module.testurls = [ tuple[1] for tuple in module.testtuples ] @@ -144,7 +144,7 @@ def module_setup(module): chunk = re.sub(r"([\[\]().|+*?])", r"\\\1", chunk) # @@ -27,0 \+23,1 @@ chunk = re.sub(r"(?m)^@@ -\d+,(\d+) \\\+\d+,(\d+) @@$", r"@@ -\d+,\1 \+\d+,\2 @@", chunk) - module.diffchunks.append(chunk) + module.diffchunks[item] = chunk # find ignore chunks for root, dirs, files in os.walk(settings.BASE_DIR+"/../test/ignore/"): @@ -325,7 +325,10 @@ class UrlTestCase(TestCase): contextlines = 0 difflist = list(unified_diff(goodtext, testtext, master, url, "", "", contextlines, lineterm="")) diff = "\n".join(difflist) - for chunk in module.diffchunks: + keys = module.diffchunks.keys() + keys.sort + for key in keys: + chunk = module.diffchunks[key] if chunk: if not re.search(chunk, diff): log("No match: %s" % chunk[:32]) diff --git a/test/diff/generic-diff_footer_1 b/test/diff/generic-diff_footer_1 index aec89b435..35cc55f63 100644 --- a/test/diff/generic-diff_footer_1 +++ b/test/diff/generic-diff_footer_1 @@ -1 +1,2 @@ +@@ -104,0 +104,1 @@ +Made with djangov0.98-dev, Tue, 26 Jun 2007 - webmaster@ietf.org \ No newline at end of file diff --git a/test/diff/generic-diff_footer_2 b/test/diff/generic-diff_footer_2 index 35cc55f63..aec89b435 100644 --- a/test/diff/generic-diff_footer_2 +++ b/test/diff/generic-diff_footer_2 @@ -1,2 +1 @@ -@@ -104,0 +104,1 @@ +Made with djangov0.98-dev, Tue, 26 Jun 2007 - webmaster@ietf.org \ No newline at end of file