File tree Expand file tree Collapse file tree 1 file changed +20
-0
lines changed
tests/test_unit/test_cdf_tk/test_commands/test_deployv2 Expand file tree Collapse file tree 1 file changed +20
-0
lines changed Original file line number Diff line number Diff line change @@ -131,11 +131,31 @@ def test_read_build_directory(
131131 actual : type [Exception ] | ReadBuildDirectory
132132 try :
133133 actual = DeployV2Command .read_build_directory (Path ("build" ), include )
134+ self ._standardize (actual )
134135 except Exception as e :
135136 actual = type (e )
136137
138+ if isinstance (expected , ReadBuildDirectory ):
139+ self ._standardize (expected )
140+
137141 assert actual == expected
138142
143+ def _standardize (self , read_dir : ReadBuildDirectory ) -> None :
144+ """The read_build_directory function depends on .glob() that is not deterministic in the order
145+ it returns files and folders."""
146+ read_dir .invalid_directories .sort ()
147+ self ._standardize_resource_directories (read_dir .resource_directories )
148+ self ._standardize_resource_directories (read_dir .skipped_directories )
149+
150+ def _standardize_resource_directories (self , resource_directories : list [ResourceDirectory ]) -> None :
151+ resource_directories .sort (key = lambda r : r .directory )
152+ for dir_ in resource_directories :
153+ dir_ .invalid_files .sort ()
154+ dir_ .files_by_crud = {
155+ key : sorted (value )
156+ for key , value in sorted (dir_ .files_by_crud .items (), key = lambda item : item [0 ].__name__ )
157+ }
158+
139159
140160class TestCreateDeploymentPlan :
141161 @pytest .mark .parametrize (
You can’t perform that action at this time.
0 commit comments