mirror of https://github.com/python/cpython
Use os.devnull instead of hardcoded '/dev/null'.
This commit is contained in:
commit
5fd174a78d
|
@ -295,7 +295,7 @@ class SelectorEventLoopUnixSocketTests(test_utils.TestCase):
|
|||
|
||||
def test_create_unix_connection_path_sock(self):
|
||||
coro = self.loop.create_unix_connection(
|
||||
lambda: None, '/dev/null', sock=object())
|
||||
lambda: None, os.devnull, sock=object())
|
||||
with self.assertRaisesRegex(ValueError, 'path and sock can not be'):
|
||||
self.loop.run_until_complete(coro)
|
||||
|
||||
|
@ -308,14 +308,14 @@ class SelectorEventLoopUnixSocketTests(test_utils.TestCase):
|
|||
|
||||
def test_create_unix_connection_nossl_serverhost(self):
|
||||
coro = self.loop.create_unix_connection(
|
||||
lambda: None, '/dev/null', server_hostname='spam')
|
||||
lambda: None, os.devnull, server_hostname='spam')
|
||||
with self.assertRaisesRegex(ValueError,
|
||||
'server_hostname is only meaningful'):
|
||||
self.loop.run_until_complete(coro)
|
||||
|
||||
def test_create_unix_connection_ssl_noserverhost(self):
|
||||
coro = self.loop.create_unix_connection(
|
||||
lambda: None, '/dev/null', ssl=True)
|
||||
lambda: None, os.devnull, ssl=True)
|
||||
|
||||
with self.assertRaisesRegex(
|
||||
ValueError, 'you have to pass server_hostname when using ssl'):
|
||||
|
|
|
@ -87,11 +87,11 @@ class BZ2FileTest(BaseTest):
|
|||
|
||||
def testBadArgs(self):
|
||||
self.assertRaises(TypeError, BZ2File, 123.456)
|
||||
self.assertRaises(ValueError, BZ2File, "/dev/null", "z")
|
||||
self.assertRaises(ValueError, BZ2File, "/dev/null", "rx")
|
||||
self.assertRaises(ValueError, BZ2File, "/dev/null", "rbt")
|
||||
self.assertRaises(ValueError, BZ2File, "/dev/null", compresslevel=0)
|
||||
self.assertRaises(ValueError, BZ2File, "/dev/null", compresslevel=10)
|
||||
self.assertRaises(ValueError, BZ2File, os.devnull, "z")
|
||||
self.assertRaises(ValueError, BZ2File, os.devnull, "rx")
|
||||
self.assertRaises(ValueError, BZ2File, os.devnull, "rbt")
|
||||
self.assertRaises(ValueError, BZ2File, os.devnull, compresslevel=0)
|
||||
self.assertRaises(ValueError, BZ2File, os.devnull, compresslevel=10)
|
||||
|
||||
def testRead(self):
|
||||
self.createTempFile()
|
||||
|
|
|
@ -186,9 +186,9 @@ class CgiTests(unittest.TestCase):
|
|||
cgi.initlog("%s", "Testing initlog 1")
|
||||
cgi.log("%s", "Testing log 2")
|
||||
self.assertEqual(cgi.logfp.getvalue(), "Testing initlog 1\nTesting log 2\n")
|
||||
if os.path.exists("/dev/null"):
|
||||
if os.path.exists(os.devnull):
|
||||
cgi.logfp = None
|
||||
cgi.logfile = "/dev/null"
|
||||
cgi.logfile = os.devnull
|
||||
cgi.initlog("%s", "Testing log 3")
|
||||
self.addCleanup(cgi.closelog)
|
||||
cgi.log("Testing log 4")
|
||||
|
|
|
@ -1922,7 +1922,7 @@ class POSIXProcessTestCase(BaseTestCase):
|
|||
open_fds = set(fds)
|
||||
# add a bunch more fds
|
||||
for _ in range(9):
|
||||
fd = os.open("/dev/null", os.O_RDONLY)
|
||||
fd = os.open(os.devnull, os.O_RDONLY)
|
||||
self.addCleanup(os.close, fd)
|
||||
open_fds.add(fd)
|
||||
|
||||
|
@ -1984,7 +1984,7 @@ class POSIXProcessTestCase(BaseTestCase):
|
|||
open_fds = set()
|
||||
# Add a bunch more fds to pass down.
|
||||
for _ in range(40):
|
||||
fd = os.open("/dev/null", os.O_RDONLY)
|
||||
fd = os.open(os.devnull, os.O_RDONLY)
|
||||
open_fds.add(fd)
|
||||
|
||||
# Leave a two pairs of low ones available for use by the
|
||||
|
|
Loading…
Reference in New Issue