diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2013-09-14 23:47:04 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2013-09-14 23:47:04 +0200 |
| commit | 2956c144d30558141ec43bec798a424974ffa6f1 (patch) | |
| tree | 297a3a9de73f66f5ad0224e60d7ae7520048d282 /test | |
| parent | 729677cd85cffedec8f481f1b6025f00fb637e13 (diff) | |
| parent | 38a1135ab8f3ab2e97d07fa8e339067c67722e16 (diff) | |
| download | mitmproxy-2956c144d30558141ec43bec798a424974ffa6f1.tar.gz mitmproxy-2956c144d30558141ec43bec798a424974ffa6f1.tar.bz2 mitmproxy-2956c144d30558141ec43bec798a424974ffa6f1.zip | |
Merge branch 'master' into 0.10
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/test_utils.py b/test/test_utils.py index db6feb4d..f40e0a31 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -38,7 +38,7 @@ def test_pretty_size(): assert utils.pretty_size(100) == "100B" assert utils.pretty_size(1024) == "1kB" assert utils.pretty_size(1024 + (1024/2.0)) == "1.5kB" - assert utils.pretty_size(1024*1024) == "1M" + assert utils.pretty_size(1024*1024) == "1MB" def test_pkg_data(): |