Merge pull request #5935 from DIRACGridBot/cherry-pick-2-8143920a4-integration

[sweep:integration] fix (Resources): fix listDirectory for local storage

Author: Andrei Tsaregorodtsev

src/DIRAC/Resources/Storage/FileStorage.py

@@ -444,6 +444,9 @@ def createDirectory(self, path):
                 os.makedirs(url)
                 successful[url] = True
             except OSError as ose:
+                if ose.errno == errno.EEXIST:
+                    successful[url] = True
+                    continue
                 failed[url] = str(ose)
 
         return S_OK({"Failed": failed, "Successful": successful})
@@ -537,16 +540,21 @@ def listDirectory(self, path):
 
         for url in urls:
             try:
-                dirs = []
-                files = []
+                dirs = {}
+                files = {}
                 # os.listdir returns files and directories together
                 for child in os.listdir(url):
                     fullpath = os.path.join(url, child)
                     lfnPath = os.path.join("/", os.path.relpath(fullpath, self.basePath))
+                    res = self.__stat(fullpath)
+                    if not res["OK"]:
+                        failed[lfnPath] = res["Message"]
+                        continue
+
                     if os.path.isfile(fullpath):
-                        files.append(lfnPath)
+                        files[lfnPath] = res["Value"]
                     else:
-                        dirs.append(lfnPath)
+                        dirs[lfnPath] = res["Value"]
 
                 successful[url] = {"SubDirs": dirs, "Files": files}
             except OSError as ose:

src/DIRAC/Resources/Storage/test/Test_FilePlugin.py

@@ -338,8 +338,14 @@ def test_04_putDirectory(self, mk_isLocalSE, mk_addAccounting):
 
         res = self.se.listDirectory(self.ALL + localdirs)
         self.assertTrue(res["OK"], res)
-        self.assertEqual(res["Value"]["Successful"][self.subDir], {"Files": [self.subFile], "SubDirs": []})
-        self.assertEqual(res["Value"]["Successful"]["/test"], {"Files": [self.existingFile], "SubDirs": [self.subDir]})
+
+        self.assertEqual(sorted(list(res["Value"]["Successful"][self.subDir])), sorted(["Files", "SubDirs"]))
+        self.assertEqual(list(res["Value"]["Successful"][self.subDir]["Files"]), [self.subFile])
+        self.assertEqual(list(res["Value"]["Successful"][self.subDir]["SubDirs"]), [])
+
+        self.assertEqual(list(res["Value"]["Successful"]["/test"]["Files"]), [self.existingFile])
+        self.assertEqual(list(res["Value"]["Successful"]["/test"]["SubDirs"]), [self.subDir])
+
         self.assertTrue(os.strerror(errno.ENOENT) in res["Value"]["Failed"][self.nonExistingFile], res)
         self.assertTrue(os.strerror(errno.ENOTDIR) in res["Value"]["Failed"][self.existingFile], res)
         self.assertTrue(os.strerror(errno.ENOENT) in res["Value"]["Failed"][nonExistingDir], res)