aboutsummaryrefslogtreecommitdiffstats
path: root/test/vpp_memif.py
diff options
context:
space:
mode:
authorPaul Vinciguerra <pvinci@vinciconsulting.com>2019-03-07 17:55:33 -0800
committerOle Trøan <otroan@employees.org>2019-03-11 09:20:04 +0000
commit22ab6f7cbb0f6139302aa6ca9f0c96dba17a37a7 (patch)
tree8995c48ce73519b8adc0c2b484e7a5eee66c28ff /test/vpp_memif.py
parenteb9a27f247e521a80ce5a3ab31b1e3a483afefab (diff)
VPP-1508: Tests: Fix vpp_api struct.error under py3.
Fix struct.error: expected bytes object got <class 'str'> Change-Id: I837ae6e97e44c789a9372677151b157956525334 Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
Diffstat (limited to 'test/vpp_memif.py')
-rw-r--r--test/vpp_memif.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/vpp_memif.py b/test/vpp_memif.py
index c6e8142030b..4ad9ffde4d7 100644
--- a/test/vpp_memif.py
+++ b/test/vpp_memif.py
@@ -1,5 +1,7 @@
import socket
+import six
+
from vpp_object import VppObject
@@ -50,8 +52,9 @@ class VppSocketFilename(VppObject):
rv = self._test.vapi.memif_socket_filename_add_del(
1, self.socket_id, self.socket_filename)
if self.add_default_folder:
- self.socket_filename = self._test.tempdir + "/" \
- + self.socket_filename
+ self.socket_filename = b"%s/%s" % (
+ six.ensure_binary(self._test.tempdir, encoding='utf-8'),
+ self.socket_filename)
return rv
def remove_vpp_config(self):