From eb7e4591ae69ae8c0db53a30ffc87efa3e024903 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Fri, 21 Jun 2019 11:20:14 -0700 Subject: [PATCH] Fix ios test for python2 non-ascii paths --- test/units/plugins/cliconf/test_ios.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/units/plugins/cliconf/test_ios.py b/test/units/plugins/cliconf/test_ios.py index c60b69ec67c..3f3e9ddb466 100644 --- a/test/units/plugins/cliconf/test_ios.py +++ b/test/units/plugins/cliconf/test_ios.py @@ -26,9 +26,11 @@ from mock import MagicMock, call from units.compat import unittest from ansible.plugins.cliconf import ios +from ansible.module_utils._text import to_bytes -FIXTURE_DIR = b'%s/fixtures/ios' % ( - path.dirname(path.abspath(__file__)).encode('utf-8') + +b_FIXTURE_DIR = b'%s/fixtures/ios' % ( + to_bytes(path.dirname(path.abspath(__file__)), errors='surrogate_or_strict') ) @@ -40,7 +42,7 @@ def _connection_side_effect(*args, **kwargs): value = kwargs.get('command') fixture_path = path.abspath( - b'%s/%s' % (FIXTURE_DIR, b'_'.join(value.split(b' '))) + b'%s/%s' % (b_FIXTURE_DIR, b'_'.join(value.split(b' '))) ) with open(fixture_path, 'rb') as file_desc: return file_desc.read()