[Python-checkins] r75702 - in python/branches/release31-maint: Lib/test/test_curses.py

[r.david.murray]

Author: r.david.murray
Date: Sun Oct 25 23:54:02 2009
New Revision: 75702

Log:
Merged revisions 75519 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

regrtest -j support wasn't backported to 3.1, but in 3.1 regrtest itself
captures stdout, so doing this skip is needed.

................
  r75519 | r.david.murray | 2009-10-19 12:04:44 -0400 (Mon, 19 Oct 2009) | 12 lines
  
  Note that on py3k we are actually looking at sys.stdout, not sys.__stdout__.
  
  Merged revisions 75518 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r75518 | r.david.murray | 2009-10-19 12:01:28 -0400 (Mon, 19 Oct 2009) | 3 lines
    
    Only run test_curses when sys.__stdout__ is a tty.  This eliminates the
    last false positive when running regrtest with -j.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_curses.py

Modified: python/branches/release31-maint/Lib/test/test_curses.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_curses.py	(original)
+++ python/branches/release31-maint/Lib/test/test_curses.py	Sun Oct 25 23:54:02 2009
@@ -275,6 +275,8 @@
         curses.resetty()
 
 def test_main():
+    if not sys.stdout.isatty():
+        raise unittest.SkipTest("sys.stdout is not a tty")
     # testing setupterm() inside initscr/endwin
     # causes terminal breakage
     curses.setupterm(fd=sys.stdout.fileno())