Merge pull request #156 from vdaskalov/issue-155

Modified alias of FileNotFoundError to OSError instead of IOError

Author: ionrock

cachecontrol/caches/file_cache.py

@@ -9,7 +9,7 @@
     FileNotFoundError
 except NameError:
     # py2.X
-    FileNotFoundError = IOError
+    FileNotFoundError = OSError
 
 
 def _secure_open_write(filename, fmode):

tests/test_adapter.py

@@ -24,7 +24,9 @@ def use_adapter():
 def sess(url, request):
     sess = request.param()
     sess.get(url)
-    return sess
+    yield sess
+    # closing session object
+    sess.close()
 
 
 class TestSessionActions(object):

tests/test_chunked_response.py

@@ -11,7 +11,10 @@
 
 @pytest.fixture()
 def sess():
-    return CacheControl(requests.Session())
+    sess = CacheControl(requests.Session())
+    yield sess
+    # closing session object
+    sess.close()
 
 
 class TestChunkedResponses(object):

tests/test_etag.py

@@ -37,7 +37,9 @@ def sess(self, url):
             cache=self.cache,
             serializer=NullSerializer(),
         )
-        return sess
+        yield sess
+        # closing session object
+        sess.close()
 
     def test_etags_get_example(self, sess, server):
         """RFC 2616 14.26

tests/test_regressions.py

@@ -17,6 +17,7 @@ def test_file_cache_recognizes_consumed_file_handle(self):
         s.get('http://httpbin.org/cache/60')
         r = s.get('http://httpbin.org/cache/60')
         assert r.from_cache
+        s.close()
 
 
 def test_getattr_during_gc():

tests/test_storage_filecache.py

@@ -29,7 +29,9 @@ def sess(self, url, tmpdir):
         self.url = url
         self.cache = FileCache(str(tmpdir))
         sess = CacheControl(requests.Session(), cache=self.cache)
-        return sess
+        yield sess
+        # closing session object
+        sess.close()
 
     def test_filecache_from_cache(self, sess):
         response = sess.get(self.url)
@@ -105,8 +107,22 @@ def test_simple_lockfile_arg(self, tmpdir, value, expected):
             cache = FileCache(str(tmpdir))
 
         assert issubclass(cache.lock_class, expected)
+        cache.close()
 
     def test_lock_class(self, tmpdir):
         lock_class = object()
         cache = FileCache(str(tmpdir), lock_class=lock_class)
         assert cache.lock_class is lock_class
+        cache.close()
+        
+    def test_filecache_with_delete_request(self, tmpdir, sess):
+        # verifies issue #155
+        url = self.url + ''.join(sample(string.ascii_lowercase, randint(2, 4)))
+        sess.delete(url)
+        assert True  # test verifies no exceptions were raised
+
+    def test_filecache_with_put_request(self, tmpdir, sess):
+        # verifies issue #155
+        url = self.url + ''.join(sample(string.ascii_lowercase, randint(2, 4)))
+        sess.put(url)
+        assert True  # test verifies no exceptions were raised