Skip to content

bpo-18748: test_io: silence destructor errors #12805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 12, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions Lib/test/test_io.py
Original file line number Diff line number Diff line change
Expand Up @@ -991,6 +991,9 @@ def flush(self):
# This would cause an assertion failure.
self.assertRaises(OSError, f.close)

# Silence destructor error
R.flush = lambda self: None


class CIOTest(IOTest):

Expand Down Expand Up @@ -1167,6 +1170,10 @@ def bad_close():
self.assertEqual(err.exception.__context__.args, ('flush',))
self.assertFalse(b.closed)

# Silence destructor error
raw.close = lambda: None
b.flush = lambda: None

def test_nonnormalized_close_error_on_close(self):
# Issue #21677
raw = self.MockRawIO()
Expand All @@ -1184,6 +1191,10 @@ def bad_close():
self.assertIn('non_existing_flush', str(err.exception.__context__))
self.assertFalse(b.closed)

# Silence destructor error
b.flush = lambda: None
raw.close = lambda: None

def test_multi_close(self):
raw = self.MockRawIO()
b = self.tp(raw)
Expand Down Expand Up @@ -2039,6 +2050,9 @@ def reader_close():
self.assertFalse(reader.closed)
self.assertTrue(writer.closed)

# Silence destructor error
reader.close = lambda: None

def test_writer_close_error_on_close(self):
def writer_close():
writer_non_existing
Expand All @@ -2053,6 +2067,9 @@ def writer_close():
self.assertTrue(reader.closed)
self.assertFalse(writer.closed)

# Silence destructor error
writer.close = lambda: None

def test_reader_writer_close_error_on_close(self):
def reader_close():
reader_non_existing
Expand All @@ -2072,6 +2089,10 @@ def writer_close():
self.assertFalse(reader.closed)
self.assertFalse(writer.closed)

# Silence destructor error
reader.close = lambda: None
writer.close = lambda: None

def test_isatty(self):
class SelectableIsAtty(MockRawIO):
def __init__(self, isatty):
Expand Down Expand Up @@ -3270,6 +3291,10 @@ def bad_close():
self.assertEqual(err.exception.__context__.args, ('flush',))
self.assertFalse(txt.closed)

# Silence destructor error
buffer.close = lambda: None
txt.flush = lambda: None

def test_nonnormalized_close_error_on_close(self):
# Issue #21677
buffer = self.BytesIO(self.testdata)
Expand All @@ -3287,6 +3312,10 @@ def bad_close():
self.assertIn('non_existing_flush', str(err.exception.__context__))
self.assertFalse(txt.closed)

# Silence destructor error
buffer.close = lambda: None
txt.flush = lambda: None

def test_multi_close(self):
txt = self.TextIOWrapper(self.BytesIO(self.testdata), encoding="ascii")
txt.close()
Expand Down