From 2c30e3999cb2a1c46d19d903b055cf4267a27f80 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=89ric=20Araujo?= Date: Thu, 6 Oct 2011 04:59:41 +0200 Subject: [PATCH] =?utf8?q?Change=20one=20name=20in=20packaging=E2=80=99s?= =?utf8?q?=20test=5Funinstall=20to=20avoid=20confusion.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit install_lib may be the name of a module, a command or an option, so I find it clearer to use site_packages to refer to a string object containing the path of the site-packages directory created in a temporary directory during tests. --- Lib/packaging/tests/test_uninstall.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Lib/packaging/tests/test_uninstall.py b/Lib/packaging/tests/test_uninstall.py index c7702dedc3..e42b48edd8 100644 --- a/Lib/packaging/tests/test_uninstall.py +++ b/Lib/packaging/tests/test_uninstall.py @@ -86,26 +86,26 @@ class UninstallTestCase(support.TempdirManager, old_out = sys.stderr sys.stderr = StringIO() dist = self.run_setup('install_dist', '--prefix=' + self.root_dir) - install_lib = self.get_path(dist, 'purelib') - return dist, install_lib + site_packages = self.get_path(dist, 'purelib') + return dist, site_packages def test_uninstall_unknow_distribution(self): self.assertRaises(PackagingError, remove, 'Foo', paths=[self.root_dir]) def test_uninstall(self): - dist, install_lib = self.install_dist() - self.assertIsFile(install_lib, 'foo', '__init__.py') - self.assertIsFile(install_lib, 'foo', 'sub', '__init__.py') - self.assertIsFile(install_lib, 'Foo-0.1.dist-info', 'RECORD') - self.assertTrue(remove('Foo', paths=[install_lib])) - self.assertIsNotFile(install_lib, 'foo', 'sub', '__init__.py') - self.assertIsNotFile(install_lib, 'Foo-0.1.dist-info', 'RECORD') + dist, site_packages = self.install_dist() + self.assertIsFile(site_packages, 'foo', '__init__.py') + self.assertIsFile(site_packages, 'foo', 'sub', '__init__.py') + self.assertIsFile(site_packages, 'Foo-0.1.dist-info', 'RECORD') + self.assertTrue(remove('Foo', paths=[site_packages])) + self.assertIsNotFile(site_packages, 'foo', 'sub', '__init__.py') + self.assertIsNotFile(site_packages, 'Foo-0.1.dist-info', 'RECORD') def test_remove_issue(self): # makes sure if there are OSErrors (like permission denied) # remove() stops and display a clean error - dist, install_lib = self.install_dist('Meh') + dist, site_packages = self.install_dist('Meh') # breaking os.rename old = os.rename @@ -115,11 +115,11 @@ class UninstallTestCase(support.TempdirManager, os.rename = _rename try: - self.assertFalse(remove('Meh', paths=[install_lib])) + self.assertFalse(remove('Meh', paths=[site_packages])) finally: os.rename = old - self.assertTrue(remove('Meh', paths=[install_lib])) + self.assertTrue(remove('Meh', paths=[site_packages])) def test_suite(): -- 2.49.0