wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix ios test for python2 non-ascii paths

Browse source
This commit is contained in:
Toshio Kuratomi 2019-06-21 11:20:14 -07:00
parent bd55617a5b
commit eb7e4591ae
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
test/units/plugins/cliconf/test_ios.py
View file

@ -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()