summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/helper_test.py12
-rw-r--r--tests/utils/argparse_test.py5
2 files changed, 10 insertions, 7 deletions
diff --git a/tests/helper_test.py b/tests/helper_test.py
index 90ce0fca..4a97bb7e 100644
--- a/tests/helper_test.py
+++ b/tests/helper_test.py
@@ -80,23 +80,23 @@ class TestHumanizeSize(unittest.TestCase):
readable = helper.humanize_size(1023)
self.assertEqual(readable, "1023")
readable = helper.humanize_size(1024)
- self.assertEqual(readable, "1K")
+ self.assertEqual(readable, "1KiB")
readable = helper.humanize_size(1234)
- self.assertEqual(readable, "1K")
+ self.assertEqual(readable, "1KiB")
def test_numbers_above_1048576_are_converted_to_megabyte(self):
readable = helper.humanize_size(1024*1024-1)
- self.assertEqual(readable, "1023K")
+ self.assertEqual(readable, "1023KiB")
readable = helper.humanize_size(1024*1024)
- self.assertEqual(readable, "1.0M")
+ self.assertEqual(readable, "1.0MiB")
def test_megabyte_numbers_are_converted_with_precision_1(self):
readable = helper.humanize_size(1234*1024)
- self.assertEqual(readable, "1.2M")
+ self.assertEqual(readable, "1.2MiB")
def test_numbers_are_not_converted_to_gigabyte(self):
readable = helper.humanize_size(1234*1024*1024)
- self.assertEqual(readable, "1234.0M")
+ self.assertEqual(readable, "1234.0MiB")
class TestSplitCommandline(unittest.TestCase):
diff --git a/tests/utils/argparse_test.py b/tests/utils/argparse_test.py
index b76e96ec..b208da8c 100644
--- a/tests/utils/argparse_test.py
+++ b/tests/utils/argparse_test.py
@@ -25,6 +25,8 @@ import shutil
import tempfile
import unittest
+import mock
+
from alot.utils import argparse as cargparse
@@ -43,7 +45,8 @@ class TestValidatedStore(unittest.TestCase):
'foo',
action=cargparse.ValidatedStoreAction,
validator=validator)
- return parser.parse_args(args)
+ with mock.patch('sys.stderr', mock.Mock()):
+ return parser.parse_args(args)
def test_validates(self):
# Arparse will raise a SystemExit (calls sys.exit) rather than letting