This is an archive of the discontinued LLVM Phabricator instance.

Differential D68745

TestFileHandle.py: fix for Python 3.6
ClosedPublic

Authored by lawrence_danna on Oct 9 2019, 4:47 PM.

Details

Reviewers
JDevlieghere
jasonmolenda
labath
Commits
rG4faec5e01ad1: TestFileHandle.py: fix for Python 3.6
rL374417: TestFileHandle.py: fix for Python 3.6
rLLDB374417: TestFileHandle.py: fix for Python 3.6
Summary

Python 3.6 stringifies exceptions as ExceptionClass("foo",) instead
of ExceptionClass("foo"). This patch makes the test assertions a
little more flexible so the test passes anyway.

Diff Detail

Event Timeline

lawrence_danna created this revision.Oct 9 2019, 4:47 PM
Herald added a project: Restricted Project. · View Herald TranscriptOct 9 2019, 4:47 PM
Harbormaster completed remote builds in B39273: Diff 224206.Oct 9 2019, 4:49 PM
labath accepted this revision.Oct 10 2019, 12:52 AM
This revision is now accepted and ready to land.Oct 10 2019, 12:52 AM
Closed by commit rG4faec5e01ad1: TestFileHandle.py: fix for Python 3.6 (authored by lawrence_danna). · Explain WhyOct 10 2019, 11:41 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lldb/
packages/
Python/
lldbsuite/
test/
python_api/
file_handle/
4 lines

Diff 224206

lldb/packages/Python/lldbsuite/test/python_api/file_handle/TestFileHandle.py

Show First 20 Lines • Show All 662 Lines • ▼ Show 20 Lines def test_exceptions(self):
self.assertRaises(TypeError, lldb.SBFile, "ham sandwich") self.assertRaises(TypeError, lldb.SBFile, "ham sandwich")
if sys.version_info[0] < 3: if sys.version_info[0] < 3:
self.assertRaises(TypeError, lldb.SBFile, ReallyBadIO()) self.assertRaises(TypeError, lldb.SBFile, ReallyBadIO())
else: else:
self.assertRaises(OhNoe, lldb.SBFile, ReallyBadIO()) self.assertRaises(OhNoe, lldb.SBFile, ReallyBadIO())
error, n = lldb.SBFile(BadIO()).Write(b"FOO") error, n = lldb.SBFile(BadIO()).Write(b"FOO")
self.assertEqual(n, 0) self.assertEqual(n, 0)
self.assertTrue(error.Fail()) self.assertTrue(error.Fail())
self.assertEqual(error.GetCString(), "OhNoe('OH NOE')") self.assertIn('OH NOE', error.GetCString())
error, n = lldb.SBFile(BadIO()).Read(bytearray(100)) error, n = lldb.SBFile(BadIO()).Read(bytearray(100))
self.assertEqual(n, 0) self.assertEqual(n, 0)
self.assertTrue(error.Fail()) self.assertTrue(error.Fail())
self.assertEqual(error.GetCString(), "OhNoe('OH NOE')") self.assertIn('OH NOE', error.GetCString())
@add_test_categories(['pyapi']) @add_test_categories(['pyapi'])
@skipIf(py_version=['<', (3,)]) @skipIf(py_version=['<', (3,)])
def test_exceptions_logged(self): def test_exceptions_logged(self):
messages = list() messages = list()
self.debugger.SetLoggingCallback(messages.append) self.debugger.SetLoggingCallback(messages.append)
self.handleCmd('log enable lldb script') self.handleCmd('log enable lldb script')
▲ Show 20 Lines • Show All 176 Lines • Show Last 20 Lines