sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

PY3: Only decode when necessary

Browse Source
This commit is contained in:
Noel Power 2018-08-04 14:23:28 +01:00 committed by Andrew Bartlett
parent ee595e9b7c
commit ade47b3df0
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
selftest/subunithelper.py
View File

@ -26,6 +26,8 @@ from samba import subunit
from samba.subunit.run import TestProtocolClient
from samba.subunit import iso8601
import unittest
from samba.compat import binary_type
VALID_RESULTS = set(['success', 'successful', 'failure', 'fail', 'skip',
'knownfail', 'error', 'xfail', 'skip-testsuite',
@ -91,7 +93,10 @@ def parse_results(msg_ops, statistics, fh):
else:
reason += l
remote_error = subunit.RemoteError(reason.decode("utf-8"))
if isinstance(reason, binary_type):
remote_error = subunit.RemoteError(reason.decode("utf-8"))
else:
remote_error = subunit.RemoteError(reason)
if not terminated:
statistics['TESTS_ERROR'] += 1