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

Some fixes to ietf/tests.py, and various updated diffs.

Browse source 
- Legacy-Id: 671
This commit is contained in:
Henrik Levkowetz 2007-06-26 22:25:28 +00:00
parent 0ca78de484
commit c6cd8eed3b
13 changed files with 34 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ietf/tests.py
View file

@ -140,7 +140,7 @@ def module_setup(module):
for item in os.listdir(testdir):
path = testdir + "/" + item
if item.startswith("generic-") and os.path.isfile(path):
chunk = filetext(path).strip()
chunk = filetext(path).rstrip()
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)
@ -310,30 +310,36 @@ class UrlTestCase(TestCase):
for regex in module.ignores[ignore]:
testtext = re.sub(regex, "", testtext)
goodtext = re.sub(regex, "", goodtext)
testtext = lines(testtext)
goodtext = lines(goodtext)
#log("Checking text: %s" % testtext[:96])
testtext = lines(testtext.strip())
goodtext = lines(goodtext.strip())
if "sort" in codes:
testtext = sorted(testtext)
while testtext and not testtext[0]:
del testtext[0]
while testtext and not testtext[-1]:
del testtext[-1]
goodtext = sorted(goodtext)
while goodtext and not goodtext[0]:
del goodtext[0]
while goodtext and not goodtext[-1]:
del goodtext[-1]
if testtext == goodtext:
note("OK cmp %s" % (url))
else:
contextlines = 0
difflist = list(unified_diff(goodtext, testtext, master, url, "", "", contextlines, lineterm=""))
diff = "\n".join(difflist)
log("Checking diff: %s" % diff[:96])
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])
log("No match: %s" % chunk[:96])
while re.search(chunk, diff):
log("Found chunk: %s" % chunk[:32])
log("Found chunk: %s" % chunk[:96])
diff = re.sub(chunk, "", diff)
if len(diff.strip().splitlines()) == 2:
# only the initial 2 lines of the diff remains --
@ -355,8 +361,8 @@ class UrlTestCase(TestCase):
note("Failed diff: %s" % (url))
else:
note("Diff: %s" % (url))
print "\n".join(difflist[:100])
if len(difflist) > 100:
print "\n".join(diff.split("\n")[:100])
if len(diff.split("\n")) > 100:
print "... (skipping %s lines of diff)" % (len(difflist)-100)
else:
note("OK cmp %s" % (url))

2
test/diff/_ipr_ipr-657_
View file

@ -11,6 +11,6 @@
@@ -49,1 +50,1 @@
-IETF Participant in Section III above)
+the Contact Information above)
@@ -58,0 +59,2 @@
@@ -58,0 +59,3 @@
+VI. Other Notes:
+No information submitted

2
test/diff/_ipr_ipr-795_
View file

@ -13,7 +13,7 @@
+the section "After the panel" from:
+http://www.proper.com/lookit/hash-futures-panel-notes.html
+The patent itself is available from:
@@ -49,1 +48,2 @@
@@ -49,1 +48,3 @@
-covered.
+covered:
+No information submitted

2
test/diff/_ipr_ipr-834_
View file

@ -22,6 +22,6 @@
@@ -70,1 +70,1 @@
-IETF Participant in Section III above)
+the Contact Information above)
@@ -79,0 +79,2 @@
@@ -79,0 +79,3 @@
+VIII. Other Notes:
+No information submitted

3
test/diff/_ipr_new-generic_
View file

@ -72,4 +72,5 @@
+Same as in Section II above:
@@ -86,1 +90,1 @@
-VI. Other Note(s):
+VI. Other Notes:
+VI. Other Notes:
@@ -88,0 +92,1 @@

3
test/diff/_ipr_new-specific_
View file

@ -70,4 +70,5 @@
+Same as in Section III above:
@@ -102,1 +105,1 @@
-VIII. Other Note(s):
+VIII. Other Notes:
+VIII. Other Notes:
@@ -104,0 +107,1 @@

3
test/diff/_ipr_new-third-party_
View file

@ -37,4 +37,5 @@
+NO
@@ -48,1 +50,1 @@
-covered.
+covered:
+covered:
@@ -50,0 +52,1 @@

12
test/diff/_ipr_search__rfc_search=1034&option=rfc_search
View file

@ -1,26 +1,26 @@
--- https://datatracker.ietf.org/public/ipr_search.cgi?option=rfc_search&rfc_search=1034
+++ /ipr/search/?rfc_search=1034&option=rfc_search
@@ -149,1 +149,1 @@
@@ -149,1 +150,1 @@
-Search result on RFC1035, "Domain names - implementation and specification", that was updated by RFC3658, "Delegation Signer Resource Record"
+Search result on RFC1035, "Domain names - implementation and specification", that was updated by RFC4033, "DNS Security Introduction and Requirements"
@@ -172,2 +172,2 @@
@@ -172,2 +173,2 @@
-Search result on RFC2181, "Clarifications to the DNS Specification", that updated RFC1035, "Domain names - implementation and specification"
-Search result on RFC2308, "Negative Caching of DNS Queries (DNS NCACHE)", that updated RFC1035, "Domain names - implementation and specification"
+Search result on RFC2181, "Clarifications to the DNS Specification", that was updated by RFC4035, "Protocol Modifications for the DNS Security Extensions"
+Search result on RFC2308, "Negative Caching of DNS Queries (DNS NCACHE)", that was updated by RFC4035, "Protocol Modifications for the DNS Security Extensions"
@@ -189,2 +189,2 @@
@@ -189,2 +190,2 @@
-Search result on RFC3008, "Domain Name System Security (DNSSEC) Signing Authority", that was obsoleted by RFC4033, "DNS Security Introduction and Requirements"
-Search result on RFC3090, "DNS Security Extension Clarification on Zone Status", that was obsoleted by RFC4035, "Protocol Modifications for the DNS Security Extensions"
+Search result on RFC3008, "Domain Name System Security (DNSSEC) Signing Authority", that was updated by RFC3658, "Delegation Signer Resource Record"
+Search result on RFC3090, "DNS Security Extension Clarification on Zone Status", that was updated by RFC3658, "Delegation Signer Resource Record"
@@ -202,2 +202,2 @@
@@ -202,2 +203,2 @@
-Search result on RFC3658, "Delegation Signer Resource Record", that updated RFC3090, "DNS Security Extension Clarification on Zone Status"
-Search result on RFC3755, "Legacy Resolver Compatibility for Delegation Signer", that updated RFC3658, "Delegation Signer Resource Record"
+Search result on RFC3658, "Delegation Signer Resource Record", that was updated by RFC3755, "Legacy Resolver Compatibility for Delegation Signer"
+Search result on RFC3755, "Legacy Resolver Compatibility for Delegation Signer", that was updated by RFC3845, "DNS Security (DNSSEC) NextSECure (NSEC) RDATA Format"
@@ -205,1 +205,1 @@
@@ -205,1 +206,1 @@
-Search result on RFC3845, "DNS Security (DNSSEC) NextSECure (NSEC) RDATA Format", that updated RFC3755, "Legacy Resolver Compatibility for Delegation Signer"
+Search result on RFC3845, "DNS Security (DNSSEC) NextSECure (NSEC) RDATA Format", that was obsoleted by RFC4035, "Protocol Modifications for the DNS Security Extensions"
@@ -207,1 +207,1 @@
@@ -207,1 +208,1 @@
-Search result on RFC4034, "Resource Records for the DNS Security Extensions", that obsoleted RFC3008, "Domain Name System Security (DNSSEC) Signing Authority"
+Search result on RFC4034, "Resource Records for the DNS Security Extensions", that updated RFC2136, "Dynamic Updates in the Domain Name System (DNS UPDATE)"

1
test/diff/generic-diff_A-hat
View file

@ -1,3 +1,4 @@
@@ -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

1
test/diff/generic-diff_footer_1
View file

@ -1,2 +1,3 @@
@@ -104,0 +104,1 @@
+Made with djangov0.98-dev, Tue, 26 Jun 2007 - webmaster@ietf.org

1
test/diff/generic-diff_footer_2
View file

@ -1 +1,2 @@
+Made with djangov0.98-dev, Tue, 26 Jun 2007 - webmaster@ietf.org

2
test/diff/generic-diff_footer_3 Normal file
View file

@ -0,0 +1,2 @@
+Made with djangov, - webmaster@ietf.org

1
test/diff/generic-diff_missing_page-produced-by_1
View file

@ -1,3 +1,4 @@
@@ -162,1 +159,0 @@
-Did you find a bug? Let us know.
@@ -164,5 +160,0 @@