diff options
| author |   Ole Troan <ot@cisco.com> | 2018-12-06 17:35:12 +0100 |
|---|---|---|
| committer |   Neale Ranns <nranns@cisco.com> | 2018-12-10 08:01:56 +0000 |
| commit | 7f99183a20d60cd5c648cc23d7a2f30a594a215b (patch) | |
| tree | bb3934aab296ce5fa531bfc5ab47921a113ffd26 /test/framework.py | |
| parent | 521a8d7df423a0b5aaf259d49ca9230705bc25ee (diff) | |
Test framework: StringIO fixes for Python3
Add 2/3 support to binarytomac and mactobinary and move to vpp_mac.py
Change-Id: I3dc7e4a24486aee22140c781aae7e44e58935877
Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'test/framework.py')
| -rw-r--r-- | test/framework.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/framework.py b/test/framework.py index 8a1bfcb660b..c84c8cafb59 100644 --- a/test/framework.py +++ b/test/framework.py @@ -120,7 +120,7 @@ def pump_output(testclass): split = read.splitlines(True) if len(stderr_fragment) > 0: split[0] = "%s%s" % (stderr_fragment, split[0]) - if len(split) > 0 and split[-1].endswith("\n"): + if len(split) > 0 and split[-1].endswith(b"\n"): limit = None else: limit = -1 @@ -487,7 +487,7 @@ class VppTestCase(unittest.TestCase): if hasattr(cls, 'pump_thread_stop_flag'): cls.pump_thread_stop_flag.set() if hasattr(cls, 'pump_thread_wakeup_pipe'): - os.write(cls.pump_thread_wakeup_pipe[1], 'ding dong wake up') + os.write(cls.pump_thread_wakeup_pipe[1], b'ding dong wake up') if hasattr(cls, 'pump_thread'): cls.logger.debug("Waiting for pump thread to stop") cls.pump_thread.join() @@ -528,7 +528,7 @@ class VppTestCase(unittest.TestCase): stderr_log(single_line_delim) stderr_log('VPP output to stderr while running %s:', cls.__name__) stderr_log(single_line_delim) - vpp_output = "".join(cls.vpp_stderr_deque) + vpp_output = "".join(str(cls.vpp_stderr_deque)) with open(cls.tempdir + '/vpp_stderr.txt', 'w') as f: f.write(vpp_output) stderr_log('\n%s', vpp_output) |