diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-07-02 14:45:45 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-07-02 14:45:45 (GMT) |
| commit | 2ee61884fe350bc1efbd20bffb305d6eac5a1937 (patch) | |
| tree | 2c82ae7b7cc8ac4a312bf924922a5e49f4cd722c | |
| parent | 9d872e19aac7f09d9b127936427d998bd1e3170c (diff) | |
| download | cpython-2ee61884fe350bc1efbd20bffb305d6eac5a1937.zip cpython-2ee61884fe350bc1efbd20bffb305d6eac5a1937.tar.gz cpython-2ee61884fe350bc1efbd20bffb305d6eac5a1937.tar.bz2 | |
Clean up NEWS entry and tests for shutil.disk_usage (#12442)
| -rw-r--r-- | Doc/whatsnew/3.3.rst | 2 | ||||
| -rw-r--r-- | Lib/test/test_shutil.py | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst index a2f512b..e5e1805 100644 --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -206,7 +206,7 @@ handle NAT with non-secure FTP without opening fixed ports. shutil ------ -The :mod:`shutil` module has a new :func:`~shutil.disk_usage` providing total, +The :mod:`shutil` module has a new :func:`~shutil.disk_usage` function providing total, used and free disk space statistics. (Contributed by Giampaolo Rodolà in :issue:`12442`) diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index 20e9412..b17ff3e 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -732,11 +732,11 @@ class TestShutil(unittest.TestCase): "disk_usage not available on this platform") def test_disk_usage(self): usage = shutil.disk_usage(os.getcwd()) - self.assertTrue(usage.total > 0) - self.assertTrue(usage.used > 0) - self.assertTrue(usage.free >= 0) - self.assertTrue(usage.total >= usage.used) - self.assertTrue(usage.total > usage.free) + self.assertGreater(usage.total, 0) + self.assertGreater(usage.used, 0) + self.assertGreaterEqual(usage.free, 0) + self.assertGreaterEqual(usage.total, usage.used) + self.assertGreater(usage.total, usage.free) class TestMove(unittest.TestCase): |