summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2013-01-18 05:10:37 (GMT)
committerBenjamin Peterson <benjamin@python.org>2013-01-18 05:10:37 (GMT)
commit9f30abd3935704528f784d03f9a630a923c485e9 (patch)
treed425de4df6f4cb121fcd281b9dcd7ef6d67b522b /Lib
parentbfc02452a3e49cfaf51a068dc3668c8810a8b8de (diff)
parentc68a4a048cf4e2d520b00546d8a4eef3a2723e8b (diff)
downloadcpython-9f30abd3935704528f784d03f9a630a923c485e9.zip
cpython-9f30abd3935704528f784d03f9a630a923c485e9.tar.gz
cpython-9f30abd3935704528f784d03f9a630a923c485e9.tar.bz2
merge 3.3
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_signal.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index d2fd84b..3d250e1 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -219,6 +219,13 @@ class WindowsSignalTests(unittest.TestCase):
signal.signal(7, handler)
+class WakeupFDTests(unittest.TestCase):
+
+ def test_invalid_fd(self):
+ fd = support.make_bad_fd()
+ self.assertRaises(ValueError, signal.set_wakeup_fd, fd)
+
+
@unittest.skipIf(sys.platform == "win32", "Not valid on Windows")
class WakeupSignalTests(unittest.TestCase):
def check_wakeup(self, test_body, *signals, ordered=True):
@@ -861,8 +868,8 @@ class PendingSignalsTests(unittest.TestCase):
def test_main():
try:
support.run_unittest(PosixTests, InterProcessSignalTests,
- WakeupSignalTests, SiginterruptTest,
- ItimerTest, WindowsSignalTests,
+ WakeupFDTests, WakeupSignalTests,
+ SiginterruptTest, ItimerTest, WindowsSignalTests,
PendingSignalsTests)
finally:
support.reap_children()