diff --git a/dvc/cache.py b/dvc/cache.py index 86dc8aa78..0b8c1ac0f 100644 --- a/dvc/cache.py +++ b/dvc/cache.py @@ -64,15 +64,6 @@ class Cache(object): relpath = os.path.relpath(path, self.cache_dir) return os.path.dirname(relpath) + os.path.basename(relpath) - def find_cache(self, files): - file_set = set(files) - cached = {} - for cache_file in self.all(): - cached_files = list(filter(lambda f: System.samefile(cache_file, f), file_set)) - cached.update(dict((f, os.path.basename(os.path.dirname(cache_file)) + os.path.basename(cache_file)) for f in cached_files)) - file_set = file_set - set(cached_files) - return cached - def _changed(self, md5): cache = self.get(md5) if self.state.changed(cache, md5=md5): diff --git a/tests/test_cache.py b/tests/test_cache.py index be6bf0b02..5811a5c76 100644 --- a/tests/test_cache.py +++ b/tests/test_cache.py @@ -26,23 +26,6 @@ class TestCache(TestDvc): cache = Cache(self.dvc.dvc_dir).get(self.cache1_md5) self.assertEquals(cache, self.cache1) - def test_find_cache(self): - fname1 = os.path.basename(self.cache1) - fname1_md5 = self.cache1_md5 - fname2 = os.path.basename(self.cache2) - fname2_md5 = self.cache2_md5 - fname3 = 'non_existing' - - System.hardlink(self.cache1, fname1) - System.hardlink(self.cache2, fname2) - - cache = Cache(self.dvc.dvc_dir).find_cache([fname1, fname2, fname3]) - - expected = {fname1: fname1_md5, fname2: fname2_md5} - - self.assertEqual(len(cache), 2) - self.assertEqual(cache, expected) - class TestCacheLoadBadDirCache(TestDvc): def _do_test(self, ret):