Merged revisions 78283 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78283 | mark.dickinson | 2010-02-21 13:42:03 +0000 (Sun, 21 Feb 2010) | 9 lines

  Merged revisions 78281 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r78281 | mark.dickinson | 2010-02-21 13:37:53 +0000 (Sun, 21 Feb 2010) | 1 line

    Issue #7384:  skip test_curses on FreeBSD, in order to allow other buildbot tests to complete.
  ........
................

diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py
index 9273ba8311ac90414a545d6c27399db79ae7385e..57d4e8b1612f800867a766d93d01670680995314 100644 (file)
--- a/Lib/test/test_curses.py
+++ b/Lib/test/test_curses.py
@@ -23,6 +23,12 @@ requires('curses')
 curses = import_module('curses')
 curses.panel = import_module('curses.panel')
 
+# skip all these tests on FreeBSD: test_curses currently hangs the
+# FreeBSD buildbots, preventing other tests from running.  See issue
+# #7384.
+if 'freebsd' in sys.platform:
+    raise unittest.SkipTest('The curses module is broken on FreeBSD.  See http://bugs.python.org/issue7384.')
+
 # XXX: if newterm was supported we could use it instead of initscr and not exit
 term = os.environ.get('TERM')
 if not term or term == 'unknown':