Merge pull request #596 from enovance/test/list_directory_with_subdir

Test/list directory with subdir

Author: dmp42

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

@@ -122,7 +122,10 @@ def list_directory(self, path=None):
         ls = []
         for k in self._storage.keys():
             if (not k == path) and k.startswith(path or ''):
-                ls.append(k)
+                prefix = '/'
+                if not k.startswith('/'):
+                    prefix = ''
+                ls.append(prefix + "/".join(k.lstrip("/").split("/")[0:2]))
 
         if not len(ls):
             raise exceptions.FileNotFoundError('%s is not there' % path)

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

@@ -22,6 +22,7 @@
 from ..core import compat
 from ..core import driver
 from ..core import exceptions
+from nose import SkipTest  # noqa
 from nose import tools
 
 logger = logging.getLogger(__name__)
@@ -283,6 +284,24 @@ def test_list_directory(self):
         assert sorted([fb1, fb2]
                       ) == sorted(list(self._storage.list_directory(base)))
 
+    def test_list_directory_with_subdir(self):
+        if self.scheme == 's3':
+            raise SkipTest("Check GH #596.")
+        base = self.gen_random_string()
+        dir1 = self.gen_random_string()
+        dir2 = self.gen_random_string()
+        filename1 = self.gen_random_string()
+        filename2 = self.gen_random_string()
+        fd1 = '%s/%s' % (base, dir1)
+        fd2 = '%s/%s' % (base, dir2)
+        fb1 = '%s/%s' % (fd1, filename1)
+        fb2 = '%s/%s' % (fd2, filename2)
+        content = self.gen_random_string().encode('utf8')
+        self._storage.put_content(fb1, content)
+        self._storage.put_content(fb2, content)
+        assert sorted([fd1, fd2]
+                      ) == sorted(list(self._storage.list_directory(base)))
+
     # def test_root_list_directory(self):
     #     fb1 = self.gen_random_string()
     #     fb2 = self.gen_random_string()