Now better test removal + updated dumb driver to match

Docker-DCO-1.1-Signed-off-by: Mangled Deutz <[email protected]> (github: dmp42)

Author: Mangled Deutz

depends/docker-registry-core/docker_registry/drivers/dumb.py

@@ -53,9 +53,20 @@ def put_content(self, path, content):
         self._storage[path] = content
 
     def remove(self, path):
-        if path not in self._storage:
+        # Straight key, delete
+        if path in self._storage:
+            del self._storage[path]
+            return
+        # Directory like, get the list
+        ls = []
+        for k in self._storage.keys():
+            if (not k == path) and k.startswith(path):
+                ls.append(k)
+
+        if not len(ls):
             raise exceptions.FileNotFoundError('%s is not there' % path)
-        del self._storage[path]
+        for item in ls:
+            self.remove(item)
 
     def stream_read(self, path, bytes_range=None):
         if path not in self._storage:

depends/docker-registry-core/docker_registry/testing/driver.py

@@ -167,6 +167,30 @@ def test_remove_existent(self):
         self._storage.remove(filename)
         assert not self._storage.exists(filename)
 
+    def test_remove_folder(self):
+        dirname = self.gen_random_string()
+        filename1 = self.gen_random_string()
+        filename2 = self.gen_random_string()
+        content = self.gen_random_string().encode('utf8')
+        self._storage.put_content('%s/%s' % (dirname, filename1), content)
+        self._storage.put_content('%s/%s' % (dirname, filename2), content)
+        self._storage.remove(dirname)
+        assert not self._storage.exists(filename1)
+        assert not self._storage.exists(filename2)
+        assert not self._storage.exists(dirname)
+        # Check the lru is ok
+        try:
+            self._storage.get_content(filename1)
+            assert False
+        except Exception:
+            pass
+
+        try:
+            self._storage.get_content(filename2)
+            assert False
+        except Exception:
+            pass
+
     @tools.raises(exceptions.FileNotFoundError)
     def test_remove_inexistent(self):
         filename = self.gen_random_string()