diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-10-06 04:59:41 +0200 |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-10-06 04:59:41 +0200 |
| commit | 2c30e3999cb2a1c46d19d903b055cf4267a27f80 (patch) | |
| tree | 605bd0021017f2c713a9c512c01ae76594d216ac | |
| parent | 76558e12ad377a0bc160935cf17ef54ff3292a4d (diff) | |
| download | cpython-git-2c30e3999cb2a1c46d19d903b055cf4267a27f80.tar.gz | |
Change one name in packaging’s test_uninstall to avoid confusion.
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.
| -rw-r--r-- | Lib/packaging/tests/test_uninstall.py | 24 |
1 files 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(): |