Merge pull request #49331 from dwoz/strfix

Use salt.utils to ensure string type
This commit is contained in:
Daniel Wozniak 2018-08-25 18:42:07 -07:00 committed by GitHub
commit a2e7033f33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2119,7 +2119,7 @@ class FileTest(ModuleCase, SaltReturnAssertsMixin):
'#-- end salt managed zoneend --',
'']
self.assertEqual([line.encode('utf-8') for line in expected], contents)
self.assertEqual([salt.utils.stringutils.to_str(line) for line in expected], contents)
@with_tempdir()
def test_issue_11003_immutable_lazy_proxy_sum(self, base_dir):