Merge default

1 files changed, 23 insertions, 3 deletions

diff --git a/distutils2/tests/test_install.py b/distutils2/tests/test_install.py
index 571133c..197129e 100644
--- a/distutils2/tests/test_install.py
+++ b/distutils2/tests/test_install.py
@@ -1,6 +1,7 @@
 """Tests for the distutils2.install module."""
 import os
 import logging
+
 from tempfile import mkstemp
 
 from distutils2 import install
@@ -57,7 +58,7 @@ class ToInstallDist:
 
     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()
@@ -258,6 +259,25 @@ class TestInstall(LoggingCatcher, TempdirManager, unittest.TestCase):
             for key in expect:
                 self.assertEqual(expect[key], dict1[key])
 
+    def test_install_custom_dir(self):
+        dest = self.mkdtemp()
+
+        project_dir, dist = self.create_dist(
+            name='Spamlib', version='0.1',
+            data_files={'spamd': '{scripts}/spamd'})
+
+        dist.name = MagicMock(return_value='Spamlib')
+        dist.version = MagicMock(return_value='0.1')
+        dist.unpack = MagicMock(return_value=project_dir)
+
+        self.write_file([project_dir, 'setup.cfg'],
+                        ("[metadata]\n"
+                         "name = mypackage\n"
+                         "version = 0.1.0\n"))
+
+        install.install_from_infos(dest, install=[dist])
+        self.assertEqual(len(os.listdir(dest)), 1)
+
     def test_install_dists_rollback(self):
         # if one of the distribution installation fails, call uninstall on all
         # installed distributions.
@@ -312,7 +332,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 +358,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: