# HG changeset patch # User Gilles Moris # Date 1230223748 -3600 # Node ID c5e37dc38a52311414053ec2e20db55087162ac0 # Parent 45b79d3e393e534447280b01c0e0698478fdc3ca test-hgweb-*: replace "XX years ago" by a fixed string in get-with-headers.py Note that other sed replacement commands are also filtering get-with-headers.py, but they seem to be more test specific, hence not handled here. diff -r 45b79d3e393e -r c5e37dc38a52 tests/get-with-headers.py --- a/tests/get-with-headers.py Sat Dec 20 16:12:01 2008 -0600 +++ b/tests/get-with-headers.py Thu Dec 25 17:49:08 2008 +0100 @@ -3,7 +3,7 @@ __doc__ = """This does HTTP get requests given a host:port and path and returns a subset of the headers plus the body of the result.""" -import httplib, sys +import httplib, sys, re try: import msvcrt, os @@ -21,7 +21,9 @@ if response.getheader(h, None) is not None: print "%s: %s" % (h, response.getheader(h)) print -sys.stdout.write(response.read()) +data = response.read() +data = re.sub('\d+ years', 'many years', data) +sys.stdout.write(data) if 200 <= response.status <= 299: sys.exit(0) diff -r 45b79d3e393e -r c5e37dc38a52 tests/test-hgweb-commands --- a/tests/test-hgweb-commands Sat Dec 20 16:12:01 2008 -0600 +++ b/tests/test-hgweb-commands Thu Dec 25 17:49:08 2008 +0100 @@ -20,21 +20,21 @@ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/log/?style=atom' | sed "s/http:\/\/[^/]*\//http:\/\/127.0.0.1\//" "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/log/1/?style=atom' | sed "s/http:\/\/[^/]*\//http:\/\/127.0.0.1\//" "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/log/1/foo/?style=atom' | sed "s/http:\/\/[^/]*\//http:\/\/127.0.0.1\//" -"$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/shortlog/' | sed "s/[0-9]* years/many years/" -"$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/rev/0/' | sed "s/[0-9]* years ago/long ago/g" +"$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/shortlog/' +"$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/rev/0/' "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/rev/1/?style=raw' echo % File-related "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/file/1/foo/?style=raw' "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/annotate/1/foo/?style=raw' "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/file/1/?style=raw' -"$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/file/1/foo' | sed "s/[0-9]* years/many years/" +"$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/file/1/foo' "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/filediff/1/foo/?style=raw' echo % Overviews "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/tags/?style=atom' | sed "s/http:\/\/[^/]*\//http:\/\/127.0.0.1\//" -"$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/summary/?style=gitweb' | sed "s/[0-9]* years ago/long ago/g" -"$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/graph/?style=gitweb' | sed "s/[0-9]* years/long/g" +"$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/summary/?style=gitweb' +"$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/graph/?style=gitweb' echo % capabilities "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=capabilities' diff -r 45b79d3e393e -r c5e37dc38a52 tests/test-hgweb-commands.out Binary file tests/test-hgweb-commands.out has changed diff -r 45b79d3e393e -r c5e37dc38a52 tests/test-hgweb-diffs.out --- a/tests/test-hgweb-diffs.out Sat Dec 20 16:12:01 2008 -0600 +++ b/tests/test-hgweb-diffs.out Thu Dec 25 17:49:08 2008 +0100 @@ -59,7 +59,7 @@ date - Thu Jan 01 00:00:00 1970 +0000 (38 years ago) + Thu Jan 01 00:00:00 1970 +0000 (many years ago) parents @@ -154,7 +154,7 @@ date - Thu Jan 01 00:00:00 1970 +0000 (38 years ago) + Thu Jan 01 00:00:00 1970 +0000 (many years ago) parents @@ -241,7 +241,7 @@ date - Thu Jan 01 00:00:00 1970 +0000 (38 years ago) + Thu Jan 01 00:00:00 1970 +0000 (many years ago) parents @@ -338,7 +338,7 @@ date - Thu Jan 01 00:00:00 1970 +0000 (38 years ago) + Thu Jan 01 00:00:00 1970 +0000 (many years ago) parents diff -r 45b79d3e393e -r c5e37dc38a52 tests/test-hgweb-filelog.out --- a/tests/test-hgweb-filelog.out Sat Dec 20 16:12:01 2008 -0600 +++ b/tests/test-hgweb-filelog.out Thu Dec 25 17:49:08 2008 +0100 @@ -120,12 +120,12 @@ description - 38 years + many years test second a - 38 years + many years test first a @@ -203,12 +203,12 @@ description - 38 years + many years test second a - 38 years + many years test first a @@ -286,7 +286,7 @@ description - 38 years + many years test first a @@ -364,7 +364,7 @@ description - 38 years + many years test first a diff -r 45b79d3e393e -r c5e37dc38a52 tests/test-hgweb-removed.out --- a/tests/test-hgweb-removed.out Sat Dec 20 16:12:01 2008 -0600 +++ b/tests/test-hgweb-removed.out Thu Dec 25 17:49:08 2008 +0100 @@ -57,7 +57,7 @@ date - Thu Jan 01 00:00:00 1970 +0000 (38 years ago) + Thu Jan 01 00:00:00 1970 +0000 (many years ago) parents cb9a9f314b8b @@ -148,7 +148,7 @@ date - Thu Jan 01 00:00:00 1970 +0000 (38 years ago) + Thu Jan 01 00:00:00 1970 +0000 (many years ago) parents diff -r 45b79d3e393e -r c5e37dc38a52 tests/test-highlight --- a/tests/test-highlight Sat Dec 20 16:12:01 2008 -0600 +++ b/tests/test-highlight Thu Dec 25 17:49:08 2008 +0100 @@ -24,15 +24,15 @@ echo % hgweb filerevision, html ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/get-with-headers.py') \ - | sed "s/[0-9]* years ago/long ago/g" | sed "s/class=\"k\"/class=\"kn\"/g" + | sed "s/class=\"k\"/class=\"kn\"/g" echo % hgweb filerevision, html ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/isolatin') \ - | sed "s/[0-9]* years ago/long ago/g" | sed "s/class=\"k\"/class=\"kn\"/g" + | sed "s/class=\"k\"/class=\"kn\"/g" echo % hgweb fileannotate, html ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/get-with-headers.py') \ - | sed "s/[0-9]* years ago/long ago/g" | sed "s/class=\"k\"/class=\"kn\"/g" + | sed "s/class=\"k\"/class=\"kn\"/g" echo % hgweb fileannotate, raw ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/get-with-headers.py?style=raw') \ diff -r 45b79d3e393e -r c5e37dc38a52 tests/test-highlight.out --- a/tests/test-highlight.out Sat Dec 20 16:12:01 2008 -0600 +++ b/tests/test-highlight.out Thu Dec 25 17:49:08 2008 +0100 @@ -13,7 +13,7 @@ -test: 7697c52ca9b0 get-with-headers.py +test: e55e3a42c53a get-with-headers.py @@ -24,26 +24,26 @@ mercurial

test

-

view get-with-headers.py @ 0:7697c52ca9b0

+

view get-with-headers.py @ 0:e55e3a42c53a

@@ -61,7 +61,7 @@ date - Thu Jan 01 00:00:00 1970 +0000 (long ago) + Thu Jan 01 00:00:00 1970 +0000 (many years ago) parents @@ -76,7 +76,7 @@
line source
-
1 #!/usr/bin/env python
2
3 __doc__ = """This does HTTP get requests given a host:port and path and returns
4 a subset of the headers plus the body of the result."""
5
6 import httplib, sys
7
8 try:
9 import msvcrt, os
10 msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
11 msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
12 except ImportError:
13 pass
14
15 headers = [h.lower() for h in sys.argv[3:]]
16 conn = httplib.HTTPConnection(sys.argv[1])
17 conn.request("GET", sys.argv[2])
18 response = conn.getresponse()
19 print response.status, response.reason
20 for h in headers:
21 if response.getheader(h, None) is not None:
22 print "%s: %s" % (h, response.getheader(h))
23 print
24 sys.stdout.write(response.read())
25
26 if 200 <= response.status <= 299:
27 sys.exit(0)
28 sys.exit(1)
+
1 #!/usr/bin/env python
2
3 __doc__ = """This does HTTP get requests given a host:port and path and returns
4 a subset of the headers plus the body of the result."""
5
6 import httplib, sys, re
7
8 try:
9 import msvcrt, os
10 msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
11 msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
12 except ImportError:
13 pass
14
15 headers = [h.lower() for h in sys.argv[3:]]
16 conn = httplib.HTTPConnection(sys.argv[1])
17 conn.request("GET", sys.argv[2])
18 response = conn.getresponse()
19 print response.status, response.reason
20 for h in headers:
21 if response.getheader(h, None) is not None:
22 print "%s: %s" % (h, response.getheader(h))
23 print
24 data = response.read()
25 data = re.sub('\d+ years', 'many years', data)
26 sys.stdout.write(data)
27
28 if 200 <= response.status <= 299:
29 sys.exit(0)
30 sys.exit(1)
@@ -99,7 +99,7 @@ -test: 7697c52ca9b0 isolatin +test: e55e3a42c53a isolatin @@ -110,26 +110,26 @@ mercurial

test

-

view isolatin @ 0:7697c52ca9b0

+

view isolatin @ 0:e55e3a42c53a

@@ -147,7 +147,7 @@ date - Thu Jan 01 00:00:00 1970 +0000 (long ago) + Thu Jan 01 00:00:00 1970 +0000 (many years ago) parents @@ -196,27 +196,27 @@ mercurial

test

-

annotate get-with-headers.py @ 0:7697c52ca9b0

+

annotate get-with-headers.py @ 0:e55e3a42c53a

@@ -234,7 +234,7 @@ date - Thu Jan 01 00:00:00 1970 +0000 (long ago) + Thu Jan 01 00:00:00 1970 +0000 (many years ago) parents @@ -255,7 +255,7 @@ rev   line source -test@0 1 #!/usr/bin/env pythontest@0 2 test@0 3 __doc__ = """This does HTTP get requests given a host:port and path and returnstest@0 4 a subset of the headers plus the body of the result."""test@0 5 test@0 6 import httplib, systest@0 7 test@0 8 try:test@0 9 import msvcrt, ostest@0 10 msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)test@0 11 msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)test@0 12 except ImportError:test@0 13 passtest@0 14 test@0 15 headers = [h.lower() for h in sys.argv[3:]]test@0 16 conn = httplib.HTTPConnection(sys.argv[1])test@0 17 conn.request("GET", sys.argv[2])test@0 18 response = conn.getresponse()test@0 19 print response.status, response.reasontest@0 20 for h in headers:test@0 21 if response.getheader(h, None) is not None:test@0 22 print "%s: %s" % (h, response.getheader(h))test@0 23 printtest@0 24 sys.stdout.write(response.read())test@0 25 test@0 26 if 200 <= response.status <= 299:test@0 27 sys.exit(0)test@0 28 sys.exit(1) +test@0 1 #!/usr/bin/env pythontest@0 2 test@0 3 __doc__ = """This does HTTP get requests given a host:port and path and returnstest@0 4 a subset of the headers plus the body of the result."""test@0 5 test@0 6 import httplib, sys, retest@0 7 test@0 8 try:test@0 9 import msvcrt, ostest@0 10 msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)test@0 11 msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)test@0 12 except ImportError:test@0 13 passtest@0 14 test@0 15 headers = [h.lower() for h in sys.argv[3:]]test@0 16 conn = httplib.HTTPConnection(sys.argv[1])test@0 17 conn.request("GET", sys.argv[2])test@0 18 response = conn.getresponse()test@0 19 print response.status, response.reasontest@0 20 for h in headers:test@0 21 if response.getheader(h, None) is not None:test@0 22 print "%s: %s" % (h, response.getheader(h))test@0 23 printtest@0 24 data = response.read()test@0 25 data = re.sub('\d+ years', 'many years', data)test@0 26 sys.stdout.write(data)test@0 27 test@0 28 if 200 <= response.status <= 299:test@0 29 sys.exit(0)test@0 30 sys.exit(1)