Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2025-01-19 03:14:05 -05:00
Code Issues Projects Releases Wiki Activity

tests: Fix trace-cmd recording with python3

Browse Source 
The change to python3 broke trace-cmd recording, two
strings need to be bytes instead. Fix that.

Also add a flush() that seems to be needed now.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2019-04-12 13:20:19 +02:00 committed by Jouni Malinen
parent dd1a8cef4c
commit 61876c7eed
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/hwsim/run-tests.py
View File

@ -139,7 +139,7 @@ class DataCollector(object):
stderr=open('/dev/null', 'w'), stderr=open('/dev/null', 'w'),
cwd=self._logdir) cwd=self._logdir)
l = self._trace_cmd.stdout.read(7) l = self._trace_cmd.stdout.read(7)
while self._trace_cmd.poll() is None and 'STARTED' not in l: while self._trace_cmd.poll() is None and b'STARTED' not in l:
l += self._trace_cmd.stdout.read(1) l += self._trace_cmd.stdout.read(1)
res = self._trace_cmd.returncode res = self._trace_cmd.returncode
if res: if res:
@ -157,7 +157,8 @@ class DataCollector(object):
sys.exit(1) sys.exit(1)
def __exit__(self, type, value, traceback): def __exit__(self, type, value, traceback):
if self._tracing: if self._tracing:
self._trace_cmd.stdin.write('DONE\n') self._trace_cmd.stdin.write(b'DONE\n')
self._trace_cmd.stdin.flush()
self._trace_cmd.wait() self._trace_cmd.wait()
if self._dmesg: if self._dmesg:
output = os.path.join(self._logdir, '%s.dmesg' % (self._testname, )) output = os.path.join(self._logdir, '%s.dmesg' % (self._testname, ))