Commit20667e9

committed

tests: better directory collection in pgdata_content

There is no need to walk pgdata twice.We could delete parent directories instead of skipping them.

1 parent19a7c5b commit20667e9Copy full SHA for 20667e9

File tree

-19

lines changed

-19

lines changed

Lines changed: 5 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -1803,27 +1803,13 @@ def pgdata_content(self, pgdata, ignore_ptrack=True, exclude_dirs=None):`
`1803`	`1803`	`file_fullpath,size_in_pages`
`1804`	`1804`	`)`
`1805`	`1805`
`1806`		`-forroot,dirs,filesinos.walk(pgdata,topdown=False,followlinks=True):`
`1807`		`-fordirectoryinsorted(dirs):`
	`1806`	`+fordirectoryindirs:`
`1808`	`1807`	`directory_path=os.path.join(root,directory)`
`1809`	`1808`	`directory_relpath=os.path.relpath(directory_path,pgdata)`
`1810`		`-`
`1811`		`-found=False`
`1812`		`-fordindirs_to_ignore:`
`1813`		`-ifdindirectory_relpath:`
`1814`		`-found=True`
`1815`		`-break`
`1816`		`-`
`1817`		`-# check if directory already here as part of larger directory`
`1818`		`-ifnotfound:`
`1819`		`-fordindirectory_dict['dirs']:`
`1820`		`-# print("OLD dir {0}".format(d))`
`1821`		`-ifdirectory_relpathind:`
`1822`		`-found=True`
`1823`		`-break`
`1824`		`-`
`1825`		`-ifnotfound:`
`1826`		`-directory_dict['dirs'][directory_relpath]= {}`
	`1809`	`+parent=os.path.dirname(directory_relpath)`
	`1810`	`+ifparentindirectory_dict['dirs']:`
	`1811`	`+deldirectory_dict['dirs'][parent]`
	`1812`	`+directory_dict['dirs'][directory_relpath]= {}`
`1827`	`1813`
`1828`	`1814`	`# get permissions for every file and directory`
`1829`	`1815`	`forfileindirectory_dict['dirs']:`

Comments

(0)