[master 9/16] Fix the size_test to stop using byte strings

M4rtinK installerbot-noreply at redhat.com
Thu Apr 9 15:58:17 UTC 2015


From: Vratislav Podzimek <vpodzime at redhat.com>

These are just strings now. This should be merged with the commit
53f1fb52e0967bfe629faa2245248489994bba3a.
---
 tests/size_test.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/size_test.py b/tests/size_test.py
index 885ae8e..caed9aa 100644
--- a/tests/size_test.py
+++ b/tests/size_test.py
@@ -220,19 +220,19 @@ def testMakeSpec(self):
             locale.setlocale(locale.LC_ALL, '')
 
             # untranslated specs
-            self.assertEqual(size._makeSpec(b"", b"BYTES", False), b"bytes")
-            self.assertEqual(size._makeSpec(b"Mi", b"b", False), b"mib")
+            self.assertEqual(size._makeSpec("", "BYTES", False), "bytes")
+            self.assertEqual(size._makeSpec("Mi", "b", False), "mib")
 
             # un-lower-cased specs
-            self.assertEqual(size._makeSpec(b"", b"BYTES", False, False), b"BYTES")
-            self.assertEqual(size._makeSpec(b"Mi", b"b", False, False), b"Mib")
-            self.assertEqual(size._makeSpec(b"Mi", b"B", False, False), b"MiB")
+            self.assertEqual(size._makeSpec("", "BYTES", False, False), "BYTES")
+            self.assertEqual(size._makeSpec("Mi", "b", False, False), "Mib")
+            self.assertEqual(size._makeSpec("Mi", "B", False, False), "MiB")
 
             # translated specs
-            res = size._makeSpec(b"", b"bytes", True)
+            res = size._makeSpec("", "bytes", True)
 
-            # Note that exp != _(b"bytes").lower() as one might expect
-            exp = (_(b"") + _(b"bytes")).lower()
+            # Note that exp != _("bytes").lower() as one might expect
+            exp = (_("") + _("bytes")).lower()
             self.assertEqual(res, exp)
 
     def testParseSpec(self):
@@ -357,8 +357,8 @@ class UtilityMethodsTestCase(unittest.TestCase):
 
     def testLowerASCII(self):
         """ Tests for _lowerASCII. """
-        self.assertEqual(size._lowerASCII(b""), b"")
-        self.assertEqual(size._lowerASCII(b"B"), b"b")
+        self.assertEqual(size._lowerASCII(""), "")
+        self.assertEqual(size._lowerASCII("B"), "b")
 
     def testArithmetic(self):
         s = Size("2GiB")


-- 
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/9f4fbdc80dfdf1732e56290086123f22ccc47756


More information about the anaconda-patches mailing list