From: Tim Peters <tim.peters@gmail.com>
Date: Sun, 20 Aug 2000 05:57:36 +0000 (+0000)
Subject: Changed the popen2.py _test function to use the "more" cmd when
X-Git-Tag: v2.0b1~352
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84f28db66a5f4ac86d42250b455fc4a1ca7824e3;p=thirdparty%2FPython%2Fcpython.git

Changed the popen2.py _test function to use the "more" cmd when
os.name == "nt".  This makes test_popen2 pass under Win98SE.
HOWEVER, the Win98 "more" invents a leading newline out
of thin air, and I'm not sure that the other Windows flavors
of "more" also do that.
So, somebody please try under other Windows flavors!
---

diff --git a/Lib/popen2.py b/Lib/popen2.py
index b20a36474db9..2fd9a19786c8 100644
--- a/Lib/popen2.py
+++ b/Lib/popen2.py
@@ -140,20 +140,25 @@ else:
     pass # not yet on unix
 
 def _test():
+    cmd  = "cat"
     teststr = "abc\n"
+    resultstr = teststr
+    if os.name == "nt":
+        cmd = "more"
+        resultstr = "\n" + resultstr
     print "testing popen2..."
-    r, w = popen2('cat')
+    r, w = popen2(cmd)
     w.write(teststr)
     w.close()
-    assert r.read() == teststr
+    assert r.read() == resultstr
     print "testing popen3..."
     try:
-        r, w, e = popen3(['cat'])
+        r, w, e = popen3([cmd])
     except:
-        r, w, e = popen3('cat')
+        r, w, e = popen3(cmd)
     w.write(teststr)
     w.close()
-    assert r.read() == teststr
+    assert r.read() == resultstr
     assert e.read() == ""
     for inst in _active[:]:
         inst.wait()