Skip to content

Commit dadf667

Browse files
committed
fix: make the tests independent of the order of reported files
1 parent 12535c3 commit dadf667

1 file changed

Lines changed: 17 additions & 6 deletions

File tree

src/DIRAC/WorkloadManagementSystem/JobWrapper/test/Test_JobWrapper.py

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,22 @@ def jobIDPath():
9696
(
9797
"00232454_00000244*",
9898
None,
99-
"/dirac/user/u/unknown/123/123123/00232454_00000244.xml, "
100-
"/dirac/user/u/unknown/123/123123/00232454_00000244_1.sim",
99+
[
100+
"/dirac/user/u/unknown/123/123123/00232454_00000244.xml, "
101+
"/dirac/user/u/unknown/123/123123/00232454_00000244_1.sim",
102+
"/dirac/user/u/unknown/123/123123/00232454_00000244_1.sim, "
103+
"/dirac/user/u/unknown/123/123123/00232454_00000244.xml",
104+
],
101105
),
102106
(
103107
"*.txt",
104108
None,
105-
"/dirac/user/u/unknown/123/123123/1720442808testFileUpload.txt, "
106-
"/dirac/user/u/unknown/123/123123/testFileUploadFullLFN.txt",
109+
[
110+
"/dirac/user/u/unknown/123/123123/1720442808testFileUpload.txt, "
111+
"/dirac/user/u/unknown/123/123123/testFileUploadFullLFN.txt",
112+
"/dirac/user/u/unknown/123/123123/testFileUploadFullLFN.txt, "
113+
"/dirac/user/u/unknown/123/123123/1720442808testFileUpload.txt",
114+
],
107115
),
108116
(
109117
"00232454_00000244.xml",
@@ -128,7 +136,10 @@ def jobIDPath():
128136
(
129137
"result_dir",
130138
None,
131-
"/dirac/user/u/unknown/123/123123/output.xml, /dirac/user/u/unknown/123/123123/output.txt",
139+
[
140+
"/dirac/user/u/unknown/123/123123/output.xml, /dirac/user/u/unknown/123/123123/output.txt",
141+
"/dirac/user/u/unknown/123/123123/output.txt, /dirac/user/u/unknown/123/123123/output.xml",
142+
],
132143
),
133144
(
134145
"result_dir/*.xml",
@@ -172,7 +183,7 @@ def test_OutputData(mocker, jobIDPath, outputData, outputPath, expectedResult):
172183
result = jw.processJobOutputs()
173184
os.chdir(jw.root)
174185
assert result["OK"]
175-
assert jw.jobReport.jobParameters[0][1] == expectedResult
186+
assert jw.jobReport.jobParameters[0][1] in expectedResult
176187

177188

178189
def test_performChecks():

0 commit comments

Comments
 (0)