]> granicus.if.org Git - python/commitdiff
Use os.devnull instead of hardcoded '/dev/null'.
authorSerhiy Storchaka <storchaka@gmail.com>
Sun, 15 Feb 2015 11:58:23 +0000 (13:58 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Sun, 15 Feb 2015 11:58:23 +0000 (13:58 +0200)
Lib/test/test_asyncio/test_unix_events.py
Lib/test/test_bz2.py
Lib/test/test_cgi.py
Lib/test/test_subprocess.py

index 41249ff024823b3c4f649dcfd1c110c701d15745..dc0835c527d1284cbddc40496f36a6ec967fb70b 100644 (file)
@@ -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'):
index ce012d6aa341700a33de2152f0869bde6eabe400..1535e8e6695bca3345f9323ab48bd024d93e2575 100644 (file)
@@ -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()
index 86e1f3a5f01cb0b500466f581f1357a727275532..1127dd12e6dfa731293801001217b6d900d68354 100644 (file)
@@ -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")
index 538111564afc1b0b7ebfa9a24cfc3a2975e12c94..08af71faade64c9ee189ee654869507e58ee36a2 100644 (file)
@@ -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