* Adding 3 generic chunks, which will ignore the A-hat diffs and the

   'produced by' diffs.
 * Updating ietf/tests.py to handle diff chunks right
 - Legacy-Id: 316

Author: levkowetz

ietf/tests.py

@@ -97,7 +97,13 @@ def setUp(self):
         for item in os.listdir(testdir):
             path = testdir + "/" + item
             if item.startswith("generic-") and os.path.isfile(path):
-                self.diffchunks.append(filetext(path))
+                chunk = filetext(path)
+                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)
+                #print "*** Installing diff chunk:"
+                #print chunk
+                self.diffchunks.append(chunk)
 
         # extract application urls:
         self.patterns = get_patterns(ietf.urls)
@@ -165,21 +171,28 @@ def doUrlsTest(self, lst):
                                 contextlines = 0
                                 diff = "\n".join(unified_diff(goodtext, testtext, master, url, "", "", contextlines, lineterm=""))
                                 for chunk in self.diffchunks:
-                                    if chunk in diff:
-                                        diff = diff.replace(chunk, "")
-                                dfile = "%s/../test/diff/%s" % (settings.BASE_DIR, url.replace("/", "_"))
-                                if os.path.exists(dfile):
-                                    dfile = open(dfile)
-                                    #print "Reading OK diff file:", dfile.name
-                                    okdiff = dfile.read()
-                                    dfile.close()
-                                else:
-                                    okdiff = ""
-                                if diff.strip() == okdiff.strip():
-                                    print "OK  diff %s" % (url)
-                                else:
-                                    print "Diff:    %s" % (url)
-                                    print diff
+                                    #print "*** Checking for chunk:", chunk[:24]
+                                    while re.search(chunk, diff):
+                                        #print "*** Removing chunk of %s lines" % (len(chunk.split("\n")))
+                                        diff = re.sub(chunk, "", diff)
+                                if len(diff.strip().split()) == 2:
+                                    # only the initial 2 lines of the diff remains --
+                                    # discard them too
+                                    diff = ""
+                                if diff:
+                                    dfile = "%s/../test/diff/%s" % (settings.BASE_DIR, url.replace("/", "_"))
+                                    if os.path.exists(dfile):
+                                        dfile = open(dfile)
+                                        #print "Reading OK diff file:", dfile.name
+                                        okdiff = dfile.read()
+                                        dfile.close()
+                                    else:
+                                        okdiff = ""
+                                    if diff.strip() == okdiff.strip():
+                                        print "OK  diff %s" % (url)
+                                    else:
+                                        print "Diff:    %s" % (url)
+                                        print diff
                     except:
                         print "Exception occurred for url %s" % (url)
                         raise

test/diff/generic-diff_A-hat

@@ -0,0 +1,3 @@
+@@ -16,1 +16,1 @@
+-request makes it into the ID tracker.)� A document in this state has
++request makes it into the ID tracker.) A document in this state has

test/diff/generic-diff_produced-by-1

@@ -0,0 +1,6 @@
+@@ -12,0 +12,5 @@
++Did you find a bug? Let us know .
++
++Any question or suggestion ?
++
++This page produced by the IETF Secretariat for the IESG

test/diff/generic-diff_produced-by-2

@@ -0,0 +1,8 @@
+@@ -27,0 +23,1 @@
++Did you find a bug? Let us know .
+@@ -28,0 +25,5 @@
++Any question or suggestion ?
++
++This page produced by the IETF Secretariat for the IESG
++
++