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
dd704a7c
Commit
dd704a7c
authored
9 years ago
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #20557: Use specific asserts in io tests.
parent
83add112
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
18 deletions
+20
-18
Lib/test/test_bufio.py
Lib/test/test_bufio.py
+1
-1
Lib/test/test_file.py
Lib/test/test_file.py
+2
-2
Lib/test/test_fileio.py
Lib/test/test_fileio.py
+3
-3
Lib/test/test_io.py
Lib/test/test_io.py
+10
-10
Lib/test/test_memoryio.py
Lib/test/test_memoryio.py
+4
-2
No files found.
Lib/test/test_bufio.py
View file @
dd704a7c
...
...
@@ -34,7 +34,7 @@ class BufferSizeTest:
line
=
f
.
readline
()
self
.
assertEqual
(
line
,
s
)
line
=
f
.
readline
()
self
.
assert
True
(
not
line
)
# Must be at EOF
self
.
assert
False
(
line
)
# Must be at EOF
f
.
close
()
finally
:
support
.
unlink
(
support
.
TESTFN
)
...
...
This diff is collapsed.
Click to expand it.
Lib/test/test_file.py
View file @
dd704a7c
...
...
@@ -83,8 +83,8 @@ class AutoFileTests:
def
testErrors
(
self
):
f
=
self
.
f
self
.
assertEqual
(
f
.
name
,
TESTFN
)
self
.
assert
True
(
not
f
.
isatty
())
self
.
assert
True
(
not
f
.
closed
)
self
.
assert
False
(
f
.
isatty
())
self
.
assert
False
(
f
.
closed
)
if
hasattr
(
f
,
"readinto"
):
self
.
assertRaises
((
OSError
,
TypeError
),
f
.
readinto
,
""
)
...
...
This diff is collapsed.
Click to expand it.
Lib/test/test_fileio.py
View file @
dd704a7c
...
...
@@ -113,15 +113,15 @@ class AutoFileTests(unittest.TestCase):
def
testErrors
(
self
):
f
=
self
.
f
self
.
assert
True
(
not
f
.
isatty
())
self
.
assert
True
(
not
f
.
closed
)
self
.
assert
False
(
f
.
isatty
())
self
.
assert
False
(
f
.
closed
)
#self.assertEqual(f.name, TESTFN)
self
.
assertRaises
(
ValueError
,
f
.
read
,
10
)
# Open for reading
f
.
close
()
self
.
assertTrue
(
f
.
closed
)
f
=
_FileIO
(
TESTFN
,
'r'
)
self
.
assertRaises
(
TypeError
,
f
.
readinto
,
""
)
self
.
assert
True
(
not
f
.
closed
)
self
.
assert
False
(
f
.
closed
)
f
.
close
()
self
.
assertTrue
(
f
.
closed
)
...
...
This diff is collapsed.
Click to expand it.
Lib/test/test_io.py
View file @
dd704a7c
...
...
@@ -453,7 +453,7 @@ class IOTest(unittest.TestCase):
with
self
.
open
(
support
.
TESTFN
,
"ab"
)
as
f
:
self
.
assertEqual
(
f
.
tell
(),
3
)
with
self
.
open
(
support
.
TESTFN
,
"a"
)
as
f
:
self
.
assert
True
(
f
.
tell
()
>
0
)
self
.
assert
Greater
(
f
.
tell
(),
0
)
def
test_destructor
(
self
):
record
=
[]
...
...
@@ -573,7 +573,7 @@ class IOTest(unittest.TestCase):
wr
=
weakref
.
ref
(
f
)
del
f
support
.
gc_collect
()
self
.
assert
True
(
wr
()
is
None
,
wr
)
self
.
assert
IsNone
(
wr
()
,
wr
)
with
self
.
open
(
support
.
TESTFN
,
"rb"
)
as
f
:
self
.
assertEqual
(
f
.
read
(),
b"abcxxx"
)
...
...
@@ -717,7 +717,7 @@ class CIOTest(IOTest):
del
MyIO
del
obj
support
.
gc_collect
()
self
.
assert
True
(
wr
()
is
None
,
wr
)
self
.
assert
IsNone
(
wr
()
,
wr
)
class
PyIOTest
(
IOTest
):
pass
...
...
@@ -1164,7 +1164,7 @@ class CBufferedReaderTest(BufferedReaderTest, SizeofTest):
wr
=
weakref
.
ref
(
f
)
del
f
support
.
gc_collect
()
self
.
assert
True
(
wr
()
is
None
,
wr
)
self
.
assert
IsNone
(
wr
()
,
wr
)
def
test_args_error
(
self
):
# Issue #17275
...
...
@@ -1467,7 +1467,7 @@ class CBufferedWriterTest(BufferedWriterTest, SizeofTest):
wr
=
weakref
.
ref
(
f
)
del
f
support
.
gc_collect
()
self
.
assert
True
(
wr
()
is
None
,
wr
)
self
.
assert
IsNone
(
wr
()
,
wr
)
with
self
.
open
(
support
.
TESTFN
,
"rb"
)
as
f
:
self
.
assertEqual
(
f
.
read
(),
b"123xxx"
)
...
...
@@ -2199,7 +2199,7 @@ class TextIOWrapperTest(unittest.TestCase):
t
=
self
.
TextIOWrapper
(
b
,
encoding
=
"utf-8"
)
self
.
assertEqual
(
t
.
encoding
,
"utf-8"
)
t
=
self
.
TextIOWrapper
(
b
)
self
.
assert
True
(
t
.
encoding
is
not
None
)
self
.
assert
IsNotNone
(
t
.
encoding
)
codecs
.
lookup
(
t
.
encoding
)
def
test_encoding_errors_reading
(
self
):
...
...
@@ -2958,7 +2958,7 @@ class CTextIOWrapperTest(TextIOWrapperTest):
wr
=
weakref
.
ref
(
t
)
del
t
support
.
gc_collect
()
self
.
assert
True
(
wr
()
is
None
,
wr
)
self
.
assert
IsNone
(
wr
()
,
wr
)
with
self
.
open
(
support
.
TESTFN
,
"rb"
)
as
f
:
self
.
assertEqual
(
f
.
read
(),
b"456def"
)
...
...
@@ -3106,7 +3106,7 @@ class MiscIOTest(unittest.TestCase):
def
test___all__
(
self
):
for
name
in
self
.
io
.
__all__
:
obj
=
getattr
(
self
.
io
,
name
,
None
)
self
.
assert
True
(
obj
is
not
None
,
name
)
self
.
assert
IsNotNone
(
obj
,
name
)
if
name
==
"open"
:
continue
elif
"error"
in
name
.
lower
()
or
name
==
"UnsupportedOperation"
:
...
...
@@ -3196,7 +3196,7 @@ class MiscIOTest(unittest.TestCase):
wr
=
weakref
.
ref
(
c
)
del
c
,
b
support
.
gc_collect
()
self
.
assert
True
(
wr
()
is
None
,
wr
)
self
.
assert
IsNone
(
wr
()
,
wr
)
def
test_abcs
(
self
):
# Test the visible base classes are ABCs.
...
...
@@ -3348,7 +3348,7 @@ class MiscIOTest(unittest.TestCase):
received
+=
iter
(
rf
.
read
,
None
)
sent
,
received
=
b''
.
join
(
sent
),
b''
.
join
(
received
)
self
.
assert
True
(
sent
==
received
)
self
.
assert
Equal
(
sent
,
received
)
self
.
assertTrue
(
wf
.
closed
)
self
.
assertTrue
(
rf
.
closed
)
...
...
This diff is collapsed.
Click to expand it.
Lib/test/test_memoryio.py
View file @
dd704a7c
...
...
@@ -693,7 +693,8 @@ class CBytesIOTest(PyBytesIOTest):
self
.
assertEqual
(
len
(
state
),
3
)
bytearray
(
state
[
0
])
# Check if state[0] supports the buffer interface.
self
.
assertIsInstance
(
state
[
1
],
int
)
self
.
assertTrue
(
isinstance
(
state
[
2
],
dict
)
or
state
[
2
]
is
None
)
if
state
[
2
]
is
not
None
:
self
.
assertIsInstance
(
state
[
2
],
dict
)
memio
.
close
()
self
.
assertRaises
(
ValueError
,
memio
.
__getstate__
)
...
...
@@ -749,7 +750,8 @@ class CStringIOTest(PyStringIOTest):
self
.
assertIsInstance
(
state
[
0
],
str
)
self
.
assertIsInstance
(
state
[
1
],
str
)
self
.
assertIsInstance
(
state
[
2
],
int
)
self
.
assertTrue
(
isinstance
(
state
[
3
],
dict
)
or
state
[
3
]
is
None
)
if
state
[
3
]
is
not
None
:
self
.
assertIsInstance
(
state
[
3
],
dict
)
memio
.
close
()
self
.
assertRaises
(
ValueError
,
memio
.
__getstate__
)
...
...
This diff is collapsed.
Click to expand it.
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