Make human_readable_filesize assertions locale-aware (#564)

* Make human_readable_filesize assertions locale-aware

* Use 'self._fmt' directly as suggested by @jonasbardino

Author: Martin-Rehr

tests/test_mig_lib_accounting.py

@@ -27,6 +27,7 @@
 
 """Unit tests for the migrid module pointed to in the filename"""
 
+import locale
 import os
 import pickle
 
@@ -230,12 +231,25 @@ def test_accounting(self):
         total_bytes = test_user_accounting.get('total_bytes', 0)
         self.assertEqual(total_bytes, TEST_TOTAL_BYTES)
 
+    def _fmt(self, value, decimals=3):
+        """Return a locale-aware fixed-point string matching human_readable_filesize output.
+
+        human_readable_filesize uses locale.format_string("%.*f", ...) internally,
+        so we use the same call here to guarantee the expected decimal separator
+        matches regardless of the active locale (e.g. ',' on da_DK/de_DE).
+        """
+        return locale.format_string("%.*f", (decimals, value))
+
     def test_human_readable_filesize_valid(self):
         """Test human-friendly format helper success on valid byte sizes"""
-        valid = [(0, "0 B"), (1, "1.000 B"), (42, "42.000 B"),
-                 (2**10, "1.000 KiB"), (2**30, "1.000 GiB"),
-                 (2**50, "1.000 PiB"), (2**89, "512.000 YiB"),
-                 (2**90 - 2**70, "1023.999 YiB")]
+        valid = [(0, "0 B"),
+                 (1, "%s B" % self._fmt(1.0)),
+                 (42, "%s B" % self._fmt(42.0)),
+                 (2**10, "%s KiB" % self._fmt(1.0)),
+                 (2**30, "%s GiB" % self._fmt(1.0)),
+                 (2**50, "%s PiB" % self._fmt(1.0)),
+                 (2**89, "%s YiB" % self._fmt(512.0)),
+                 (2**90 - 2**70, "%s YiB" % self._fmt(1023.999))]
         for (size, expect) in valid:
             self.assertEqual(human_readable_filesize(size), expect)
 
@@ -248,26 +262,30 @@ def test_human_readable_filesize_invalid(self):
 
     def test_human_readable_filesize_decimals(self):
         """Test human-friendly format helper with custom decimal count"""
-        cases = [(2**10, 0, "1 KiB"),
-                 (2**10, 1, "1.0 KiB"),
-                 (2**10, 2, "1.00 KiB"),
-                 (2**10, 5, "1.00000 KiB")]
+        cases = [(2**10, 0, "%s KiB" % self._fmt(1, decimals=0)),
+                 (2**10, 1, "%s KiB" % self._fmt(1.0, decimals=1)),
+                 (2**10, 2, "%s KiB" % self._fmt(1.0, decimals=2)),
+                 (2**10, 5, "%s KiB" % self._fmt(1.0, decimals=5))]
         for (size, decimals, expect) in cases:
             self.assertEqual(human_readable_filesize(size, decimals=decimals),
                              expect)
 
     def test_human_readable_filesize_si_format(self):
         """Test human-friendly format helper with SI byte units (powers of 1000)"""
         # SI exponent is still determined by log2, so values are based on 2**N
-        valid = [(0, "0 B"), (42, "42.000 B"), (2**10, "1.024 KB"),
-                 (2**20, "1.049 MB"), (2**30, "1.074 GB"), (2**50, "1.126 PB")]
+        valid = [(0, "0 B"),
+                 (42, "%s B" % self._fmt(42.0)),
+                 (2**10, "%s KB" % self._fmt(1.024)),
+                 (2**20, "%s MB" % self._fmt(1.049)),
+                 (2**30, "%s GB" % self._fmt(1.074)),
+                 (2**50, "%s PB" % self._fmt(1.126))]
         for (size, expect) in valid:
             self.assertEqual(
                 human_readable_filesize(size, si_byte_format=True), expect)
         # decimals and si_byte_format compose correctly
         self.assertEqual(
             human_readable_filesize(2**10, decimals=1, si_byte_format=True),
-            "1.0 KB")
+            "%s KB" % self._fmt(1.0, decimals=1))
 
     def test_get_usage_decimals(self):
         """Test get_usage passes decimals parameter through to report strings"""