traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Éric Araujo 2011-10-06 04:59:41 +02:00
parent 76558e12ad
commit 2c30e3999c
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Lib/packaging/tests/test_uninstall.py
View File

@ -86,26 +86,26 @@ class UninstallTestCase(support.TempdirManager,
old_out = sys.stderr old_out = sys.stderr
sys.stderr = StringIO() sys.stderr = StringIO()
dist = self.run_setup('install_dist', '--prefix=' + self.root_dir) dist = self.run_setup('install_dist', '--prefix=' + self.root_dir)
install_lib = self.get_path(dist, 'purelib') site_packages = self.get_path(dist, 'purelib')
return dist, install_lib return dist, site_packages
def test_uninstall_unknow_distribution(self): def test_uninstall_unknow_distribution(self):
self.assertRaises(PackagingError, remove, 'Foo', self.assertRaises(PackagingError, remove, 'Foo',
paths=[self.root_dir]) paths=[self.root_dir])
def test_uninstall(self): def test_uninstall(self):
dist, install_lib = self.install_dist() dist, site_packages = self.install_dist()
self.assertIsFile(install_lib, 'foo', '__init__.py') self.assertIsFile(site_packages, 'foo', '__init__.py')
self.assertIsFile(install_lib, 'foo', 'sub', '__init__.py') self.assertIsFile(site_packages, 'foo', 'sub', '__init__.py')
self.assertIsFile(install_lib, 'Foo-0.1.dist-info', 'RECORD') self.assertIsFile(site_packages, 'Foo-0.1.dist-info', 'RECORD')
self.assertTrue(remove('Foo', paths=[install_lib])) self.assertTrue(remove('Foo', paths=[site_packages]))
self.assertIsNotFile(install_lib, 'foo', 'sub', '__init__.py') self.assertIsNotFile(site_packages, 'foo', 'sub', '__init__.py')
self.assertIsNotFile(install_lib, 'Foo-0.1.dist-info', 'RECORD') self.assertIsNotFile(site_packages, 'Foo-0.1.dist-info', 'RECORD')
def test_remove_issue(self): def test_remove_issue(self):
# makes sure if there are OSErrors (like permission denied) # makes sure if there are OSErrors (like permission denied)
# remove() stops and display a clean error # remove() stops and display a clean error
dist, install_lib = self.install_dist('Meh') dist, site_packages = self.install_dist('Meh')
# breaking os.rename # breaking os.rename
old = os.rename old = os.rename
@ -115,11 +115,11 @@ class UninstallTestCase(support.TempdirManager,
os.rename = _rename os.rename = _rename
try: try:
self.assertFalse(remove('Meh', paths=[install_lib])) self.assertFalse(remove('Meh', paths=[site_packages]))
finally: finally:
os.rename = old os.rename = old
self.assertTrue(remove('Meh', paths=[install_lib])) self.assertTrue(remove('Meh', paths=[site_packages]))
def test_suite(): def test_suite():