From e49a434a3cd8eef5d4035d3b3340b28fd560d4a9 Mon Sep 17 00:00:00 2001 From: "Gregory P. Smith [Google]" Date: Wed, 5 Jul 2017 17:57:42 -0700 Subject: [PATCH 1/3] Make test_shutil test_disk_usage's more lenient. Don't assume so much about the test execution environment's getcwd() filesystem space usage reports. --- Lib/test/test_shutil.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index f21e6adf4abad0..20b91afcd73d6b 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -1306,10 +1306,10 @@ def _boo(filename, extract_dir, extra): def test_disk_usage(self): usage = shutil.disk_usage(os.getcwd()) self.assertGreater(usage.total, 0) - self.assertGreater(usage.used, 0) + self.assertGreaterEqual(usage.used, 0) self.assertGreaterEqual(usage.free, 0) self.assertGreaterEqual(usage.total, usage.used) - self.assertGreater(usage.total, usage.free) + self.assertGreaterEqual(usage.total, usage.free) @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support") @unittest.skipUnless(hasattr(os, 'chown'), 'requires os.chown') From 9226f56e100bead10948d928fa6f67f46ea781cb Mon Sep 17 00:00:00 2001 From: "Gregory P. Smith [Google]" Date: Thu, 6 Jul 2017 12:13:08 -0700 Subject: [PATCH 2/3] Use __file__ instead of os.getcwd(). Leaving the assertions as they were originally. --- Lib/test/test_shutil.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index 20b91afcd73d6b..a5af319b2e99e2 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -1304,12 +1304,12 @@ def _boo(filename, extract_dir, extra): @unittest.skipUnless(hasattr(shutil, 'disk_usage'), "disk_usage not available on this platform") def test_disk_usage(self): - usage = shutil.disk_usage(os.getcwd()) + usage = shutil.disk_usage(__file__) self.assertGreater(usage.total, 0) - self.assertGreaterEqual(usage.used, 0) + self.assertGreater(usage.used, 0) self.assertGreaterEqual(usage.free, 0) self.assertGreaterEqual(usage.total, usage.used) - self.assertGreaterEqual(usage.total, usage.free) + self.assertGreater(usage.total, usage.free) @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support") @unittest.skipUnless(hasattr(os, 'chown'), 'requires os.chown') From 7fa2313f73b53a56db8a370abca6f9c516eba751 Mon Sep 17 00:00:00 2001 From: "Gregory P. Smith [Google]" Date: Thu, 6 Jul 2017 13:03:55 -0700 Subject: [PATCH 3/3] Use dirname of __file__. --- Lib/test/test_shutil.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index a5af319b2e99e2..3b4891ddcaf63c 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -1304,7 +1304,7 @@ def _boo(filename, extract_dir, extra): @unittest.skipUnless(hasattr(shutil, 'disk_usage'), "disk_usage not available on this platform") def test_disk_usage(self): - usage = shutil.disk_usage(__file__) + usage = shutil.disk_usage(os.path.dirname(__file__)) self.assertGreater(usage.total, 0) self.assertGreater(usage.used, 0) self.assertGreaterEqual(usage.free, 0)