Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61083,61085,61092-61097,61103-61104,61110-61113 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r61113 | christian.heimes | 2008-02-28 22:00:45 +0100 (Thu, 28 Feb 2008) | 2 lines
Windows fix for signal test - skip it earlier
........
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index 03e8101..1d25814 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -1,7 +1,12 @@
import unittest
from test import test_support
import signal
-import os, sys, time, errno
+import sys, os, time, errno
+
+if sys.platform[:3] in ('win', 'os2') or sys.platform == 'riscos':
+ raise test_support.TestSkipped("Can't test signal on %s" % \
+ sys.platform)
+
class HandlerBCalled(Exception):
pass
@@ -257,10 +262,6 @@
self.assertEquals(i, False)
def test_main():
- if sys.platform[:3] in ('win', 'os2'):
- raise test_support.TestSkipped("Can't test signal on %s" % \
- sys.platform)
-
test_support.run_unittest(BasicSignalTests, InterProcessSignalTests,
WakeupSignalTests, SiginterruptTest)