maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix TestMiniDumpNew.py test for Python 2/3 issue 

On Windows, where we use Python 3 for testing, we have to be more explicit about converting between binary and string representations.  I believe this should still work for Python 2, but I don't have a convenient way to try it out.

Differential Revision: https://reviews.llvm.org/D26643

llvm-svn: 286909
This commit is contained in:
Adrian McCarthy 2016-11-14 23:53:45 +00:00
parent 7b26dbb125
commit 18270a843a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/TestMiniDumpNew.py
View File

@ -108,15 +108,16 @@ class MiniDumpNewTestCase(TestBase):
/proc/PID/status which is written in the file /proc/PID/status which is written in the file
""" """
shutil.copyfile(core, newcore) shutil.copyfile(core, newcore)
with open(newcore, "r+") as f: with open(newcore, "rb+") as f:
f.seek(offset) f.seek(offset)
self.assertEqual(f.read(5), oldpid) currentpid = f.read(5).decode('utf-8')
self.assertEqual(currentpid, oldpid)
f.seek(offset) f.seek(offset)
if len(newpid) < len(oldpid): if len(newpid) < len(oldpid):
newpid += " " * (len(oldpid) - len(newpid)) newpid += " " * (len(oldpid) - len(newpid))
newpid += "\n" newpid += "\n"
f.write(newpid) f.write(newpid.encode('utf-8'))
def test_deeper_stack_in_minidump_with_same_pid_running(self): def test_deeper_stack_in_minidump_with_same_pid_running(self):
"""Test that we read the information from the core correctly even if we """Test that we read the information from the core correctly even if we