# HG changeset patch # User Martin Geisler # Date 1252100713 -7200 # Node ID b42b03308ae9da8745b889a2ddbfeb58ea0019dd # Parent 6cfea6e4c892d762461f6b67d15c3f841756c9e2 test-highlight: remove redundant test Changeset 799373ff2554 is testing how a EUC-JP encoded Japanese file is treated in different encodings, so the ISO-8859-1 encoded German file is no longer needed. diff -r 6cfea6e4c892 -r b42b03308ae9 tests/test-highlight --- a/tests/test-highlight Fri Sep 04 23:34:51 2009 +0200 +++ b/tests/test-highlight Fri Sep 04 23:45:13 2009 +0200 @@ -47,9 +47,6 @@ print "The first %d primes: %s" % (n, list(islice(p, n))) EOF -# check for UnicodeDecodeError with iso-8859-1 file contents -python -c 'fp = open("isolatin.txt", "w"); fp.write("h\xFCbsch\n"); fp.close();' - hg ci -Ama echo % hg serve @@ -60,10 +57,6 @@ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/primes.py') \ | sed "s/class=\"k\"/class=\"kn\"/g" | sed "s/class=\"mf\"/class=\"mi\"/g" -echo % hgweb filerevision, html -("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/isolatin.txt') \ - | sed "s/class=\"k\"/class=\"kn\"/g" - echo % hgweb fileannotate, html ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/primes.py') \ | sed "s/class=\"k\"/class=\"kn\"/g" | sed "s/class=\"mi\"/class=\"mf\"/g" diff -r 6cfea6e4c892 -r b42b03308ae9 tests/test-highlight.out --- a/tests/test-highlight.out Fri Sep 04 23:34:51 2009 +0200 +++ b/tests/test-highlight.out Fri Sep 04 23:45:13 2009 +0200 @@ -1,4 +1,3 @@ -adding isolatin.txt adding primes.py % hg serve % hgweb filerevision, html @@ -12,7 +11,7 @@ -test: 3e1445510fe7 primes.py +test: 853dcd4de2a6 primes.py @@ -23,27 +22,27 @@ mercurial

test

-

view primes.py @ 0:3e1445510fe7

+

view primes.py @ 0:853dcd4de2a6

@@ -119,93 +118,6 @@ -% hgweb filerevision, html -200 Script output follows - - - - - - - - - -test: 3e1445510fe7 isolatin.txt - - - -
-
- - - - -
- -
-

test

-

view isolatin.txt @ 0:3e1445510fe7

- - - -

-
find changesets by author, revision, -files, or words in the commit message
- - -
a
- - - - - - - - - - - - - - - - - - - -
authortest
dateThu Jan 01 00:00:00 1970 +0000 (many years ago)
parents
children
- -
-
line source
- -
1 h?bsch
-
-
-
-
- - - - - - % hgweb fileannotate, html 200 Script output follows @@ -228,28 +140,28 @@ mercurial

test

-

annotate primes.py @ 0:3e1445510fe7

+

annotate primes.py @ 0:853dcd4de2a6

@@ -289,225 +201,225 @@ -test@0 +test@0 1 #!/usr/bin/env python -test@0 +test@0 2 -test@0 +test@0 3 """Fun with generators. Corresponding Haskell implementation: -test@0 +test@0 4 -test@0 +test@0 5 primes = 2 : sieve [3, 5..] -test@0 +test@0 6 where sieve (p:ns) = p : sieve [n | n <- ns, mod n p /= 0] -test@0 +test@0 7 """ -test@0 +test@0 8 -test@0 +test@0 9 from itertools import dropwhile, ifilter, islice, count, chain -test@0 +test@0 10 -test@0 +test@0 11 def primes(): -test@0 +test@0 12 """Generate all primes.""" -test@0 +test@0 13 def sieve(ns): -test@0 +test@0 14 p = ns.next() -test@0 +test@0 15 # It is important to yield *here* in order to stop the -test@0 +test@0 16 # infinite recursion. -test@0 +test@0 17 yield p -test@0 +test@0 18 ns = ifilter(lambda n: n % p != 0, ns) -test@0 +test@0 19 for n in sieve(ns): -test@0 +test@0 20 yield n -test@0 +test@0 21 -test@0 +test@0 22 odds = ifilter(lambda i: i % 2 == 1, count()) -test@0 +test@0 23 return chain([2], sieve(dropwhile(lambda n: n < 3, odds))) -test@0 +test@0 24 -test@0 +test@0 25 if __name__ == "__main__": -test@0 +test@0 26 import sys -test@0 +test@0 27 try: -test@0 +test@0 28 n = int(sys.argv[1]) -test@0 +test@0 29 except (ValueError, IndexError): -test@0 +test@0 30 n = 10 -test@0 +test@0 31 p = primes() -test@0 +test@0 32 print "The first %d primes: %s" % (n, list(islice(p, n)))