Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
85c30336
Commit
85c30336
authored
Feb 15, 2015
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use os.devnull instead of hardcoded '/dev/null'.
parent
a25c542c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
12 deletions
+12
-12
Lib/test/test_asyncio/test_unix_events.py
Lib/test/test_asyncio/test_unix_events.py
+3
-3
Lib/test/test_bz2.py
Lib/test/test_bz2.py
+5
-5
Lib/test/test_cgi.py
Lib/test/test_cgi.py
+2
-2
Lib/test/test_subprocess.py
Lib/test/test_subprocess.py
+2
-2
No files found.
Lib/test/test_asyncio/test_unix_events.py
View file @
85c30336
...
...
@@ -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'
):
...
...
Lib/test/test_bz2.py
View file @
85c30336
...
...
@@ -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
()
...
...
Lib/test/test_cgi.py
View file @
85c30336
...
...
@@ -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
\
n
Testing 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"
)
...
...
Lib/test/test_subprocess.py
View file @
85c30336
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment