Merge pull request #267 from AdamWill/filecache-implement-contains

pkgset.FileCache: implement __contains__ for efficiency

kobo/pkgset.py

@@ -229,6 +229,9 @@ def __getitem__(self, name):
     def __setitem__(self, name, value):
         self.file_cache[os.path.abspath(name)] = value
 
+    def __contains__(self, item):
+        return item in self.file_cache
+
     def __iter__(self):
         return iter(self.file_cache)
 

tests/test_pkgset.py

@@ -4,6 +4,7 @@
 
 from __future__ import print_function
 import unittest
+import unittest.mock
 
 import os
 import warnings
@@ -218,6 +219,18 @@ def test_iter(self):
         self.assertTrue(self.file1 in items)
         self.assertTrue(self.file2 in items)
 
+    def test_contains(self):
+        open(self.file1, "w").write("hello\n")
+        open(self.file2, "w").write("hello\n")
+
+        self.cache = FileCache()
+        wrap1 = self.cache.add(self.file1)
+        wrap2 = self.cache.add(self.file2)
+
+        with unittest.mock.patch("kobo.pkgset.FileCache.__iter__", side_effect=ValueError):
+            self.assertTrue(self.file1 in self.cache)
+            self.assertTrue(self.file2 in self.cache)
+
     def test_remove_by_file_path(self):
         self.test_add_two_different_files()
         self.cache.remove(self.file1)