From 583dc2485a09920745926f64a13e4b3f348e8eb4 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Wed, 14 Nov 2012 15:16:53 -0500 Subject: Clean up the messages used by some tests. --- Lib/test/test_devpoll.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Lib/test/test_devpoll.py') diff --git a/Lib/test/test_devpoll.py b/Lib/test/test_devpoll.py index bef4e1846b..ec350cd495 100644 --- a/Lib/test/test_devpoll.py +++ b/Lib/test/test_devpoll.py @@ -8,7 +8,7 @@ from test.support import TESTFN, run_unittest try: select.devpoll except AttributeError: - raise unittest.SkipTest("select.devpoll not defined -- skipping test_devpoll") + raise unittest.SkipTest("select.devpoll not defined") def find_ready_matching(ready, flag): -- cgit v1.2.1 From 40bc8cffd375821554a4201f3a9611f25fc83595 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 22 Aug 2013 00:19:50 +0200 Subject: Close #18794: Add a fileno() method and a closed attribute to select.devpoll objects. Add also tests on fileno() method and closed attribute of select.epoll and select.kqueue. --- Lib/test/test_devpoll.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'Lib/test/test_devpoll.py') diff --git a/Lib/test/test_devpoll.py b/Lib/test/test_devpoll.py index ec350cd495..167e0ee4bf 100644 --- a/Lib/test/test_devpoll.py +++ b/Lib/test/test_devpoll.py @@ -87,6 +87,31 @@ class DevPollTests(unittest.TestCase): self.assertRaises(OverflowError, pollster.poll, 1 << 63) self.assertRaises(OverflowError, pollster.poll, 1 << 64) + def test_close(self): + open_file = open(__file__, "rb") + self.addCleanup(open_file.close) + fd = open_file.fileno() + devpoll = select.devpoll() + + # test fileno() method and closed attribute + self.assertIsInstance(devpoll.fileno(), int) + self.assertFalse(devpoll.closed) + + # test close() + devpoll.close() + self.assertTrue(devpoll.closed) + self.assertRaises(ValueError, devpoll.fileno) + + # close() can be called more than once + devpoll.close() + + # operations must fail with ValueError("I/O operation on closed ...") + self.assertRaises(ValueError, devpoll.modify, fd, select.POLLIN) + self.assertRaises(ValueError, devpoll.poll) + self.assertRaises(ValueError, devpoll.register, fd, fd, select.POLLIN) + self.assertRaises(ValueError, devpoll.unregister, fd) + + def test_main(): run_unittest(DevPollTests) -- cgit v1.2.1 From e5883d6d95989121670eca012dd5bde1721747e7 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 28 Aug 2013 00:53:59 +0200 Subject: Issue #18571: Implementation of the PEP 446: file descriptors and file handles are now created non-inheritable; add functions os.get/set_inheritable(), os.get/set_handle_inheritable() and socket.socket.get/set_inheritable(). --- Lib/test/test_devpoll.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'Lib/test/test_devpoll.py') diff --git a/Lib/test/test_devpoll.py b/Lib/test/test_devpoll.py index 167e0ee4bf..40ebeee597 100644 --- a/Lib/test/test_devpoll.py +++ b/Lib/test/test_devpoll.py @@ -2,7 +2,11 @@ # Initial tests are copied as is from "test_poll.py" -import os, select, random, unittest, sys +import os +import random +import select +import sys +import unittest from test.support import TESTFN, run_unittest try: @@ -111,6 +115,11 @@ class DevPollTests(unittest.TestCase): self.assertRaises(ValueError, devpoll.register, fd, fd, select.POLLIN) self.assertRaises(ValueError, devpoll.unregister, fd) + def test_fd_non_inheritable(self): + devpoll = select.devpoll() + self.addCleanup(devpoll.close) + self.assertEqual(os.get_inheritable(devpoll.fileno()), False) + def test_main(): run_unittest(DevPollTests) -- cgit v1.2.1 From 8376d8226f84c3ebe058c5652cbeacdbc24498c8 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Sun, 15 Dec 2013 15:36:20 +0100 Subject: Import USHRT_MAX to fix failing test_devpool test --- Lib/test/test_devpoll.py | 1 + 1 file changed, 1 insertion(+) (limited to 'Lib/test/test_devpoll.py') diff --git a/Lib/test/test_devpoll.py b/Lib/test/test_devpoll.py index bd0db61664..7fa4203cdb 100644 --- a/Lib/test/test_devpoll.py +++ b/Lib/test/test_devpoll.py @@ -8,6 +8,7 @@ import select import sys import unittest from test.support import TESTFN, run_unittest +from _testcapi import USHRT_MAX try: select.devpoll -- cgit v1.2.1 From 9c5cdbac15917d706b3539a1728c701c7559854a Mon Sep 17 00:00:00 2001 From: Jesus Cea Date: Tue, 29 Apr 2014 18:18:37 +0200 Subject: Closes issue #21316: mark test_devpoll to be meaningfull only for Solaris --- Lib/test/test_devpoll.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'Lib/test/test_devpoll.py') diff --git a/Lib/test/test_devpoll.py b/Lib/test/test_devpoll.py index e634d3a373..955618ae15 100644 --- a/Lib/test/test_devpoll.py +++ b/Lib/test/test_devpoll.py @@ -9,10 +9,8 @@ import sys import unittest from test.support import TESTFN, run_unittest, cpython_only -try: - select.devpoll -except AttributeError: - raise unittest.SkipTest("select.devpoll not defined") +if not hasattr(select, 'devpoll') : + raise unittest.SkipTest('test works only on Solaris OS family') def find_ready_matching(ready, flag): -- cgit v1.2.1