[PBCKP-358] sort directories to not skip 'base/1' because of 'base/12699'

funny-falcon · funny-falcon · commit 7eab6e346353 · 2022-11-25T07:58:08.000+03:00
Looks like os.walk may yield dirs unsorted.
This way "check if directory already here as part of larger directory"
man mistakenly skip short 'base/1' as "part of" 'base/12699'
diff --git a/tests/helpers/ptrack_helpers.py b/tests/helpers/ptrack_helpers.py
@@ -1799,7 +1799,7 @@ def pgdata_content(self, pgdata, ignore_ptrack=True, exclude_dirs=None):
                         )
 
         for root, dirs, files in os.walk(pgdata, topdown=False, followlinks=True):
-            for directory in dirs:
+            for directory in sorted(dirs):
                 directory_path = os.path.join(root, directory)
                 directory_relpath = os.path.relpath(directory_path, pgdata)
 

Original file line number	Diff line number	Diff line change
`@@ -1799,7 +1799,7 @@ def pgdata_content(self, pgdata, ignore_ptrack=True, exclude_dirs=None):`
`1799`	`1799`	`)`
`1800`	`1800`
`1801`	`1801`	`for root, dirs, files in os.walk(pgdata, topdown=False, followlinks=True):`
`1802`		`- for directory in dirs:`
	`1802`	`+ for directory in sorted(dirs):`
`1803`	`1803`	`directory_path = os.path.join(root, directory)`
`1804`	`1804`	`directory_relpath = os.path.relpath(directory_path, pgdata)`
`1805`	`1805`