[master 14/30] Fix ASCII conversion tests (#1014220)

M4rtinK installerbot-noreply at redhat.com
Mon Jun 1 14:04:31 UTC 2015


From: Martin Kolman <mkolman at redhat.com>

The when the correct Unicode normalisation method has been set
(NFKD), we need to replace the old bogus values with correct ones
in the ASCII conversion tests.
---
 tests/pyanaconda_tests/iutil_test.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/pyanaconda_tests/iutil_test.py b/tests/pyanaconda_tests/iutil_test.py
index ef52e0a..e27516e 100644
--- a/tests/pyanaconda_tests/iutil_test.py
+++ b/tests/pyanaconda_tests/iutil_test.py
@@ -686,10 +686,10 @@ def to_ascii_test(self):
         self.assertEqual(iutil._toASCII(""), "")
         self.assertEqual(iutil._toASCII(" "), " ")
         self.assertEqual(iutil._toASCII("&@`'łŁ!@#$%^&*{}[]$'<>*"),
-                                        "&@`'\xc5\x82\xc5\x81!@#$%^&*{}[]$'<>*")
+                                        "&@`'!@#$%^&*{}[]$'<>*")
         self.assertEqual(iutil._toASCII("ABC"), "ABC")
         self.assertEqual(iutil._toASCII("aBC"), "aBC")
-        _out = "Heiz\xc3\xb6lr\xc3\xbccksto\xc3\x9fabd\xc3\xa4mpfung" 
+        _out = "Heizolruckstoabdampfung"
         self.assertEqual(iutil._toASCII("Heizölrückstoßabdämpfung"), _out)
 
     def upper_ascii_test(self):
@@ -700,8 +700,8 @@ def upper_ascii_test(self):
         self.assertEqual(iutil.upperASCII("A"),"A")
         self.assertEqual(iutil.upperASCII("aBc"),"ABC")
         self.assertEqual(iutil.upperASCII("_&*'@#$%^aBcžčŘ"),
-                                          "_&*'@#$%^ABC\xc5\xbe\xc4\x8d\xc5\x98")
-        _out = "HEIZ\xc3\xb6LR\xc3\xbcCKSTO\xc3\x9fABD\xc3\xa4MPFUNG"
+                                          "_&*'@#$%^ABCZCR")
+        _out = "HEIZOLRUCKSTOABDAMPFUNG"
         self.assertEqual(iutil.upperASCII("Heizölrückstoßabdämpfung"), _out)
 
 
@@ -712,8 +712,8 @@ def lower_ascii_test(self):
         self.assertEqual(iutil.lowerASCII("a"),"a")
         self.assertEqual(iutil.lowerASCII("aBc"),"abc")
         self.assertEqual(iutil.lowerASCII("_&*'@#$%^aBcžčŘ"),
-                                          "_&*'@#$%^abc\xc5\xbe\xc4\x8d\xc5\x98")
-        _out = "heiz\xc3\xb6lr\xc3\xbccksto\xc3\x9fabd\xc3\xa4mpfung"
+                                          "_&*'@#$%^abczcr")
+        _out = "heizolruckstoabdampfung"
         self.assertEqual(iutil.lowerASCII("Heizölrückstoßabdämpfung"), _out)
 
     def have_word_match_test(self):


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/cc6ef527be4b8543ec5e2658d63229e4cef35583


More information about the anaconda-patches mailing list