Fix test-demandimport and test-trusted under Windows
authorJames Abbatiello <abbeyj at gmail.com>
Tue, 14 Jul 2009 22:38:12 -0400
changeset 9174 705278e70457
parent 9168 e8441597d2ee
child 9175 22979282d8ca
Fix test-demandimport and test-trusted under Windows The Windows-only wrapper around stdout is causing both of these tests to fail. test-demandimport fails because it tries to print repr(sys.stdout). Use stderr instead since that is not wrapped. test-trusted fails because the wrapper doesn't handle softspace and an unexpected extra space gets printed.
mercurial/windows.py
tests/test-demandimport.py
tests/test-demandimport.py.out
--- a/mercurial/windows.py	Fri Jul 17 13:31:12 2009 +0200
+++ b/mercurial/windows.py	Tue Jul 14 22:38:12 2009 -0400
@@ -41,6 +41,7 @@
             limit = 16000
             l = len(s)
             start = 0
+            self.softspace = 0;
             while start < l:
                 end = start + limit
                 self.fp.write(s[start:end])
--- a/tests/test-demandimport.py	Fri Jul 17 13:31:12 2009 +0200
+++ b/tests/test-demandimport.py	Tue Jul 14 22:38:12 2009 -0400
@@ -36,5 +36,5 @@
 print "fred =", f(fred)
 
 print "re =", f(re)
-print "re.stdout =", f(re.stdout)
+print "re.stderr =", f(re.stderr)
 print "re =", f(re)
--- a/tests/test-demandimport.py.out	Fri Jul 17 13:31:12 2009 +0200
+++ b/tests/test-demandimport.py.out	Tue Jul 14 22:38:12 2009 -0400
@@ -11,5 +11,5 @@
 fred.sub = <function sub at 0x?>
 fred = <proxied module 're'>
 re = <unloaded module 'sys'>
-re.stdout = <open file '<stdout>', mode 'w' at 0x?>
+re.stderr = <open file '<stderr>', mode 'w' at 0x?>
 re = <proxied module 'sys'>