From b2f63458fcda7878d5cf674c2f1e9ca7db5bf3ce Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Tue, 31 May 2016 19:32:08 +1200 Subject: Move human-friendly format functions to netlib.human, remove redundant implementations --- test/netlib/test_human.py | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 test/netlib/test_human.py (limited to 'test/netlib/test_human.py') diff --git a/test/netlib/test_human.py b/test/netlib/test_human.py new file mode 100644 index 00000000..3a445c0b --- /dev/null +++ b/test/netlib/test_human.py @@ -0,0 +1,31 @@ +from netlib import human, tutils + +def test_parse_size(): + assert human.parse_size("1") == 1 + assert human.parse_size("1k") == 1024 + assert human.parse_size("1m") == 1024**2 + assert human.parse_size("1g") == 1024**3 + tutils.raises(ValueError, human.parse_size, "1f") + tutils.raises(ValueError, human.parse_size, "ak") + + +def test_pretty_size(): + assert human.pretty_size(100) == "100B" + assert human.pretty_size(1024) == "1kB" + assert human.pretty_size(1024 + (1024 / 2.0)) == "1.5kB" + assert human.pretty_size(1024 * 1024) == "1MB" + + +def test_pretty_duration(): + assert human.pretty_duration(0.00001) == "0ms" + assert human.pretty_duration(0.0001) == "0ms" + assert human.pretty_duration(0.001) == "1ms" + assert human.pretty_duration(0.01) == "10ms" + assert human.pretty_duration(0.1) == "100ms" + assert human.pretty_duration(1) == "1.00s" + assert human.pretty_duration(10) == "10.0s" + assert human.pretty_duration(100) == "100s" + assert human.pretty_duration(1000) == "1000s" + assert human.pretty_duration(10000) == "10000s" + assert human.pretty_duration(1.123) == "1.12s" + assert human.pretty_duration(0.123) == "123ms" -- cgit v1.2.3 From f62efed304d7ecd8f6149ff98577b381b4a3a3c9 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Tue, 31 May 2016 19:45:48 +1200 Subject: Unify and make symmetric pretty_size and parse_size --- test/netlib/test_human.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'test/netlib/test_human.py') diff --git a/test/netlib/test_human.py b/test/netlib/test_human.py index 3a445c0b..464d4646 100644 --- a/test/netlib/test_human.py +++ b/test/netlib/test_human.py @@ -1,6 +1,8 @@ from netlib import human, tutils def test_parse_size(): + assert human.parse_size("0") == 0 + assert human.parse_size("0b") == 0 assert human.parse_size("1") == 1 assert human.parse_size("1k") == 1024 assert human.parse_size("1m") == 1024**2 @@ -10,10 +12,12 @@ def test_parse_size(): def test_pretty_size(): - assert human.pretty_size(100) == "100B" - assert human.pretty_size(1024) == "1kB" - assert human.pretty_size(1024 + (1024 / 2.0)) == "1.5kB" - assert human.pretty_size(1024 * 1024) == "1MB" + assert human.pretty_size(0) == "0b" + assert human.pretty_size(100) == "100b" + assert human.pretty_size(1024) == "1k" + assert human.pretty_size(1024 + (1024 / 2.0)) == "1.5k" + assert human.pretty_size(1024 * 1024) == "1m" + assert human.pretty_size(10 * 1024 * 1024) == "10m" def test_pretty_duration(): -- cgit v1.2.3 From 40a030f215e1943aefdb2eb6fe2a264b9b1ee33c Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Tue, 31 May 2016 19:58:28 +1200 Subject: Satisfy flake8 --- test/netlib/test_human.py | 1 + 1 file changed, 1 insertion(+) (limited to 'test/netlib/test_human.py') diff --git a/test/netlib/test_human.py b/test/netlib/test_human.py index 464d4646..2a5c2a85 100644 --- a/test/netlib/test_human.py +++ b/test/netlib/test_human.py @@ -1,5 +1,6 @@ from netlib import human, tutils + def test_parse_size(): assert human.parse_size("0") == 0 assert human.parse_size("0b") == 0 -- cgit v1.2.3