Fix tests and make filesize functions raise TypeError

PyFilesystem · Oct 5, 2017 · bf4f1ac · bf4f1ac
1 parent 667ac4b
commit bf4f1ac
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 5 deletions.
diff --git a/fs/filesize.py b/fs/filesize.py
@@ -17,7 +17,7 @@ def _to_str(size, suffixes, base):
     try:
         size = int(size)
     except ValueError:
-        raise ValueError(
+        raise TypeError(
             "filesize requires a numeric value, not {!r}".format(size)
         )
     if size == 1:

diff --git a/tests/test_filesize.py b/tests/test_filesize.py
@@ -23,24 +23,68 @@ def test_traditional(self):
         )
         self.assertEqual(
             filesize.traditional(1024),
-            '1.0 KiB'
+            '1.0 KB'
         )
 
         self.assertEqual(
             filesize.traditional(1024 * 1024),
-            '1.0 MiB'
+            '1.0 MB'
         )
 
         self.assertEqual(
             filesize.traditional(1024 * 1024 + 1),
-            '1.0 MiB'
+            '1.0 MB'
         )
 
         self.assertEqual(
             filesize.traditional(1.5 * 1024 * 1024),
+            '1.5 MB'
+        )
+
+    def test_binary(self):
+
+        self.assertEqual(
+            filesize.binary(0),
+            '0 bytes'
+        )
+        self.assertEqual(
+            filesize.binary(1),
+            '1 byte'
+        )
+        self.assertEqual(
+            filesize.binary(2),
+            '2 bytes'
+        )
+        self.assertEqual(
+            filesize.binary(1024),
+            '1.0 KiB'
+        )
+        self.assertEqual(
+            filesize.binary(1024, si=False),
+            '1.0 KB'
+        )
+
+        self.assertEqual(
+            filesize.binary(1024 * 1024),
+            '1.0 MiB'
+        )
+
+        self.assertEqual(
+            filesize.binary(1024 * 1024 + 1),
+            '1.0 MiB'
+        )
+
+        self.assertEqual(
+            filesize.binary(1.5 * 1024 * 1024),
             '1.5 MiB'
         )
 
+        self.assertEqual(
+            filesize.binary(1.5 * 1024 * 1024, si=False),
+            '1.5 MB'
+        )
+
+
     def test_decimal(self):
 
         self.assertEqual(
@@ -77,5 +121,5 @@ def test_decimal(self):
 
     def test_errors(self):
 
-        with self.assertRaises(ValueError):
+        with self.assertRaises(TypeError):
             filesize.traditional('foo')