From 6a65863eea6b51e8cc40a2f120c1e923fccd0540 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 22 Aug 2012 09:28:36 -0400 Subject: fixed a unicode test for POSIXFile --- testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py') diff --git a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py index 51deeeb52..50573051c 100644 --- a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py +++ b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py @@ -4,7 +4,7 @@ import copy import difflib import binascii import lxml.etree -from Bcfg2.Bcfg2Py3k import b64encode, b64decode +from Bcfg2.Bcfg2Py3k import b64encode, b64decode, u_str from mock import Mock, MagicMock, patch from Bcfg2.Client.Tools.POSIX.File import * from .Test__init import get_posix_object @@ -62,13 +62,7 @@ class TestPOSIXFile(TestPOSIXTool): entry.text = "test" self.assertEqual(ptool._get_data(entry), ("test", False)) - ustr = u('é') - entry = copy.deepcopy(orig_entry) - entry.text = ustr - self.assertEqual(ptool._get_data(entry), (ustr, False)) - - setup['encoding'] = "utf_8" - ptool = self.get_obj(posix=get_posix_object(setup=setup)) + ustr = u_str('é', 'UTF-8') entry = copy.deepcopy(orig_entry) entry.text = ustr self.assertEqual(ptool._get_data(entry), (ustr, False)) -- cgit v1.2.3-1-g7c22