valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #45711 from bdrung/fix-unicode-tests

Browse Source 
Fix Unicode tests when run with LC_ALL=POSIX
This commit is contained in:
Nicole Thomas 2018-02-13 12:42:06 -05:00 committed by GitHub
commit b18087cee0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/unit/modules/test_zypper.py
View File

@ -49,8 +49,8 @@ def get_test_data(filename):
with salt.utils.fopen(
os.path.join(
os.path.join(
os.path.dirname(os.path.abspath(__file__)), 'zypp'), filename)) as rfh:
return rfh.read()
os.path.dirname(os.path.abspath(__file__)), 'zypp'), filename), mode='rb') as rfh:
return salt.utils.to_str(rfh.read(), 'utf-8')
@skipIf(NO_MOCK, NO_MOCK_REASON)

14
tests/unit/templates/test_jinja.py
View File

@ -294,13 +294,13 @@ class TestGetTemplate(TestCase):
'file_roots': self.local_opts['file_roots'],
'pillar_roots': self.local_opts['pillar_roots']},
a='Hi', b='Sàlt', saltenv='test', salt=self.local_salt))
self.assertEqual(out, salt.utils.to_unicode('Hey world !Hi Sàlt !' + os.linesep))
self.assertEqual(out, u'Hey world !Hi Sàlt !' + os.linesep)
self.assertEqual(fc.requests[0]['path'], 'salt://macro')
filename = os.path.join(TEMPLATES_DIR, 'files', 'test', 'non_ascii')
with salt.utils.fopen(filename) as fp_:
with salt.utils.fopen(filename, mode='rb') as fp_:
out = render_jinja_tmpl(
fp_.read(),
salt.utils.to_unicode(fp_.read(), 'utf-8'),
dict(opts={'cachedir': TEMPLATES_DIR, 'file_client': 'remote',
'file_roots': self.local_opts['file_roots'],
'pillar_roots': self.local_opts['pillar_roots']},
@ -337,11 +337,9 @@ class TestGetTemplate(TestCase):
def test_non_ascii(self):
fn = os.path.join(TEMPLATES_DIR, 'files', 'test', 'non_ascii')
out = JINJA(fn, opts=self.local_opts, saltenv='test')
with salt.utils.fopen(out['data']) as fp:
result = fp.read()
if six.PY2:
result = salt.utils.to_unicode(result)
self.assertEqual(salt.utils.to_unicode('Assunção' + os.linesep), result)
with salt.utils.fopen(out['data'], mode='rb') as fp:
result = salt.utils.to_unicode(fp.read(), 'utf-8')
self.assertEqual(u'Assunção' + os.linesep, result)
def test_get_context_has_enough_context(self):
template = '1\n2\n3\n4\n5\n6\n7\n8\n9\na\nb\nc\nd\ne\nf'