From: R. David Murray Date: Sun, 25 Oct 2009 22:54:02 +0000 (+0000) Subject: Merged revisions 75519 via svnmerge from X-Git-Tag: v3.1.2rc1~425 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa9f3d3dfbc650eadea253462986ab9ae76d2080;p=thirdparty%2FPython%2Fcpython.git 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. ........ ................ --- diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py index 2615ffb1cbd4..9273ba8311ac 100644 --- a/Lib/test/test_curses.py +++ b/Lib/test/test_curses.py @@ -275,6 +275,8 @@ def main(stdscr): 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())