diff options
author | Tarek Ziade <tarek@ziade.org> | 2012-03-12 14:45:50 -0700 |
---|---|---|
committer | Tarek Ziade <tarek@ziade.org> | 2012-03-12 14:45:50 -0700 |
commit | 065332c0f9814048c4d3e4c8dc74b9a6146312d5 (patch) | |
tree | 145e74c37c316559e774e40a07a9c98f62e56965 /distutils2 | |
parent | 7f8819357ea358c2f70b5ece6516c8dedc5dfd0b (diff) | |
download | disutils2-065332c0f9814048c4d3e4c8dc74b9a6146312d5.tar.gz |
fixed a test mock issue (#14268)
Diffstat (limited to 'distutils2')
-rw-r--r-- | distutils2/install.py | 3 | ||||
-rw-r--r-- | distutils2/tests/test_install.py | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/distutils2/install.py b/distutils2/install.py index 84bd39f..85af932 100644 --- a/distutils2/install.py +++ b/distutils2/install.py @@ -244,7 +244,8 @@ def install_from_infos(install_path=None, install=[], remove=[], conflicts=[], temp_dir = tempfile.mkdtemp() for dist in remove: files = dist.list_installed_files() - temp_files[dist] = _move_files(files, temp_dir) + paths = [path for path, md5, size in files] + temp_files[dist] = _move_files(paths, temp_dir) try: if install: install_dists(install, install_path, paths) diff --git a/distutils2/tests/test_install.py b/distutils2/tests/test_install.py index d00116c..cb1d499 100644 --- a/distutils2/tests/test_install.py +++ b/distutils2/tests/test_install.py @@ -57,7 +57,7 @@ class ToInstallDist(object): def list_installed_files(self, **args): if self._files: - return self._real_files + return [(path, 'md5', 0) for path in self._real_files] def get_install(self, **args): return self.list_installed_files() @@ -312,7 +312,7 @@ class TestInstall(LoggingCatcher, TempdirManager, unittest.TestCase): # assert that the files have been removed for dist in dists: - for f in dist.list_installed_files(): + for f, md5, size in dist.list_installed_files(): self.assertFalse(os.path.exists(f)) finally: install.install_dists = old_install_dists @@ -338,7 +338,7 @@ class TestInstall(LoggingCatcher, TempdirManager, unittest.TestCase): # assert that the files are in the same place # assert that the files have been removed for dist in remove: - for f in dist.list_installed_files(): + for f, md5, size in dist.list_installed_files(): self.assertTrue(os.path.exists(f)) dist._unlink_installed_files() finally: |