Skip to content

Commit dc54ec9

Browse files
hbelmirohbelmiro
committed
issue-11979 - WIP - fix tests - set params fields
Signed-off-by: Helber Belmiro <[email protected]>
1 parent 43a1c6d commit dc54ec9

File tree

3 files changed

+48
-78
lines changed

3 files changed

+48
-78
lines changed

‎backend/test/v2/integration/dag_status_conditional_test.go‎

Lines changed: 20 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -168,13 +168,10 @@ func (s *DAGStatusConditionalTestSuite) TestSimpleIfTrue() {
168168
}
169169

170170
t.Logf("Attempting pipeline upload...")
171-
// DEBUG: Log upload parameters
172-
uploadParamsObj := uploadParams.NewUploadPipelineParams()
173-
t.Logf("DEBUG: NewUploadPipelineParams() returned: %+v", uploadParamsObj)
174-
t.Logf("DEBUG: Upload params fields - Description: %v, DisplayName: %v, Name: %v, Namespace: %v",
175-
uploadParamsObj.Description, uploadParamsObj.DisplayName, uploadParamsObj.Name, uploadParamsObj.Namespace)
176-
177-
pipeline, err := s.pipelineUploadClient.UploadFile(filePath, uploadParamsObj)
171+
pipeline, err := s.pipelineUploadClient.UploadFile(filePath, &uploadParams.UploadPipelineParams{
172+
Name: util.StringPointer("conditional-if-true-test"),
173+
DisplayName: util.StringPointer("Conditional If True Test Pipeline"),
174+
})
178175

179176
// Detailed error logging
180177
if err != nil {
@@ -220,15 +217,12 @@ func (s *DAGStatusConditionalTestSuite) TestSimpleIfTrue() {
220217
func (s *DAGStatusConditionalTestSuite) TestSimpleIfFalse() {
221218
t := s.T()
222219

223-
// DEBUG: Log upload parameters
224-
uploadParamsObj := uploadParams.NewUploadPipelineParams()
225-
t.Logf("DEBUG: NewUploadPipelineParams() returned: %+v", uploadParamsObj)
226-
t.Logf("DEBUG: Upload params fields - Description: %v, DisplayName: %v, Name: %v, Namespace: %v",
227-
uploadParamsObj.Description, uploadParamsObj.DisplayName, uploadParamsObj.Name, uploadParamsObj.Namespace)
228-
229220
pipeline, err := s.pipelineUploadClient.UploadFile(
230221
"../resources/dag_status/conditional_if_false.yaml",
231-
uploadParamsObj,
222+
&uploadParams.UploadPipelineParams{
223+
Name: util.StringPointer("conditional-if-false-test"),
224+
DisplayName: util.StringPointer("Conditional If False Test Pipeline"),
225+
},
232226
)
233227

234228
if err != nil {
@@ -265,15 +259,12 @@ func (s *DAGStatusConditionalTestSuite) TestSimpleIfFalse() {
265259
func (s *DAGStatusConditionalTestSuite) TestIfElseTrue() {
266260
t := s.T()
267261

268-
// DEBUG: Log upload parameters
269-
uploadParamsObj := uploadParams.NewUploadPipelineParams()
270-
t.Logf("DEBUG: NewUploadPipelineParams() returned: %+v", uploadParamsObj)
271-
t.Logf("DEBUG: Upload params fields - Description: %v, DisplayName: %v, Name: %v, Namespace: %v",
272-
uploadParamsObj.Description, uploadParamsObj.DisplayName, uploadParamsObj.Name, uploadParamsObj.Namespace)
273-
274262
pipeline, err := s.pipelineUploadClient.UploadFile(
275263
"../resources/dag_status/conditional_if_else_true.yaml",
276-
uploadParamsObj,
264+
&uploadParams.UploadPipelineParams{
265+
Name: util.StringPointer("conditional-if-else-true-test"),
266+
DisplayName: util.StringPointer("Conditional If-Else True Test Pipeline"),
267+
},
277268
)
278269

279270
if err != nil {
@@ -309,15 +300,12 @@ func (s *DAGStatusConditionalTestSuite) TestIfElseTrue() {
309300
func (s *DAGStatusConditionalTestSuite) TestIfElseFalse() {
310301
t := s.T()
311302

312-
// DEBUG: Log upload parameters
313-
uploadParamsObj := uploadParams.NewUploadPipelineParams()
314-
t.Logf("DEBUG: NewUploadPipelineParams() returned: %+v", uploadParamsObj)
315-
t.Logf("DEBUG: Upload params fields - Description: %v, DisplayName: %v, Name: %v, Namespace: %v",
316-
uploadParamsObj.Description, uploadParamsObj.DisplayName, uploadParamsObj.Name, uploadParamsObj.Namespace)
317-
318303
pipeline, err := s.pipelineUploadClient.UploadFile(
319304
"../resources/dag_status/conditional_if_else_false.yaml",
320-
uploadParamsObj,
305+
&uploadParams.UploadPipelineParams{
306+
Name: util.StringPointer("conditional-if-else-false-test"),
307+
DisplayName: util.StringPointer("Conditional If-Else False Test Pipeline"),
308+
},
321309
)
322310

323311
if err != nil {
@@ -353,18 +341,12 @@ func (s *DAGStatusConditionalTestSuite) TestIfElseFalse() {
353341
func (s *DAGStatusConditionalTestSuite) TestComplexConditional() {
354342
t := s.T()
355343

356-
// DEBUG: Log upload parameters
357-
uploadParamsObj := uploadParams.NewUploadPipelineParams()
358-
t.Logf("DEBUG: NewUploadPipelineParams() returned: %+v", uploadParamsObj)
359-
t.Logf("DEBUG: Upload params fields - Description: %v, DisplayName: %v, Name: %v, Namespace: %v",
360-
uploadParamsObj.Description, uploadParamsObj.DisplayName, uploadParamsObj.Name, uploadParamsObj.Namespace)
361-
362-
t.Logf("DEBUG: About to call UploadFile with file: ../resources/dag_status/conditional_complex.yaml")
363-
t.Logf("DEBUG: PipelineUploadClient is nil: %v", s.pipelineUploadClient == nil)
364-
365344
pipeline, err := s.pipelineUploadClient.UploadFile(
366345
"../resources/dag_status/conditional_complex.yaml",
367-
uploadParamsObj,
346+
&uploadParams.UploadPipelineParams{
347+
Name: util.StringPointer("conditional-complex-test"),
348+
DisplayName: util.StringPointer("Conditional Complex Test Pipeline"),
349+
},
368350
)
369351

370352
if err != nil {

‎backend/test/v2/integration/dag_status_nested_test.go‎

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,12 @@ func (s *DAGStatusNestedTestSuite) cleanUp() {
123123
func (s *DAGStatusNestedTestSuite) TestSimpleNested() {
124124
t := s.T()
125125
126-
// DEBUG: Log upload parameters
127-
uploadParamsObj := uploadParams.NewUploadPipelineParams()
128-
t.Logf("DEBUG: NewUploadPipelineParams() returned: %+v", uploadParamsObj)
129-
t.Logf("DEBUG: Upload params fields - Description: %v, DisplayName: %v, Name: %v, Namespace: %v",
130-
uploadParamsObj.Description, uploadParamsObj.DisplayName, uploadParamsObj.Name, uploadParamsObj.Namespace)
131-
132126
pipeline, err := s.pipelineUploadClient.UploadFile(
133127
"../resources/dag_status/nested_simple.yaml",
134-
uploadParamsObj,
128+
&uploadParams.UploadPipelineParams{
129+
Name: util.StringPointer("nested-simple-test"),
130+
DisplayName: util.StringPointer("Nested Simple Test Pipeline"),
131+
},
135132
)
136133
137134
if err != nil {
@@ -173,15 +170,12 @@ func (s *DAGStatusNestedTestSuite) TestSimpleNested() {
173170
func (s *DAGStatusNestedTestSuite) TestNestedParallelFor() {
174171
t := s.T()
175172
176-
// DEBUG: Log upload parameters
177-
uploadParamsObj := uploadParams.NewUploadPipelineParams()
178-
t.Logf("DEBUG: NewUploadPipelineParams() returned: %+v", uploadParamsObj)
179-
t.Logf("DEBUG: Upload params fields - Description: %v, DisplayName: %v, Name: %v, Namespace: %v",
180-
uploadParamsObj.Description, uploadParamsObj.DisplayName, uploadParamsObj.Name, uploadParamsObj.Namespace)
181-
182173
pipeline, err := s.pipelineUploadClient.UploadFile(
183174
"../resources/dag_status/nested_parallel_for.yaml",
184-
uploadParamsObj,
175+
&uploadParams.UploadPipelineParams{
176+
Name: util.StringPointer("nested-parallel-for-test"),
177+
DisplayName: util.StringPointer("Nested Parallel For Test Pipeline"),
178+
},
185179
)
186180
187181
if err != nil {
@@ -223,15 +217,12 @@ func (s *DAGStatusNestedTestSuite) TestNestedParallelFor() {
223217
func (s *DAGStatusNestedTestSuite) TestNestedConditional() {
224218
t := s.T()
225219
226-
// DEBUG: Log upload parameters
227-
uploadParamsObj := uploadParams.NewUploadPipelineParams()
228-
t.Logf("DEBUG: NewUploadPipelineParams() returned: %+v", uploadParamsObj)
229-
t.Logf("DEBUG: Upload params fields - Description: %v, DisplayName: %v, Name: %v, Namespace: %v",
230-
uploadParamsObj.Description, uploadParamsObj.DisplayName, uploadParamsObj.Name, uploadParamsObj.Namespace)
231-
232220
pipeline, err := s.pipelineUploadClient.UploadFile(
233221
"../resources/dag_status/nested_conditional.yaml",
234-
uploadParamsObj,
222+
&uploadParams.UploadPipelineParams{
223+
Name: util.StringPointer("nested-conditional-test"),
224+
DisplayName: util.StringPointer("Nested Conditional Test Pipeline"),
225+
},
235226
)
236227
237228
if err != nil {
@@ -273,15 +264,12 @@ func (s *DAGStatusNestedTestSuite) TestNestedConditional() {
273264
func (s *DAGStatusNestedTestSuite) TestDeepNesting() {
274265
t := s.T()
275266
276-
// DEBUG: Log upload parameters
277-
uploadParamsObj := uploadParams.NewUploadPipelineParams()
278-
t.Logf("DEBUG: NewUploadPipelineParams() returned: %+v", uploadParamsObj)
279-
t.Logf("DEBUG: Upload params fields - Description: %v, DisplayName: %v, Name: %v, Namespace: %v",
280-
uploadParamsObj.Description, uploadParamsObj.DisplayName, uploadParamsObj.Name, uploadParamsObj.Namespace)
281-
282267
pipeline, err := s.pipelineUploadClient.UploadFile(
283268
"../resources/dag_status/nested_deep.yaml",
284-
uploadParamsObj,
269+
&uploadParams.UploadPipelineParams{
270+
Name: util.StringPointer("nested-deep-test"),
271+
DisplayName: util.StringPointer("Nested Deep Test Pipeline"),
272+
},
285273
)
286274
287275
if err != nil {

‎backend/test/v2/integration/dag_status_parallel_for_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,18 +123,12 @@ func TestDAGStatusParallelFor(t *testing.T) {
123123
func (s *DAGStatusParallelForTestSuite) TestSimpleParallelForSuccess() {
124124
t := s.T()
125125

126-
// DEBUG: Log upload parameters
127-
uploadParamsObj := uploadParams.NewUploadPipelineParams()
128-
t.Logf("DEBUG: NewUploadPipelineParams() returned: %+v", uploadParamsObj)
129-
t.Logf("DEBUG: Upload params fields - Description: %v, DisplayName: %v, Name: %v, Namespace: %v",
130-
uploadParamsObj.Description, uploadParamsObj.DisplayName, uploadParamsObj.Name, uploadParamsObj.Namespace)
131-
132-
t.Logf("DEBUG: About to call UploadFile with file: ../resources/dag_status/parallel_for_success.yaml")
133-
t.Logf("DEBUG: PipelineUploadClient is nil: %v", s.pipelineUploadClient == nil)
134-
135126
pipeline, err := s.pipelineUploadClient.UploadFile(
136127
"../resources/dag_status/parallel_for_success.yaml",
137-
uploadParamsObj,
128+
&uploadParams.UploadPipelineParams{
129+
Name: util.StringPointer("parallel-for-success-test"),
130+
DisplayName: util.StringPointer("Parallel For Success Test Pipeline"),
131+
},
138132
)
139133

140134
if err != nil {
@@ -176,7 +170,10 @@ func (s *DAGStatusParallelForTestSuite) TestSimpleParallelForFailure() {
176170
177171
pipeline, err := s.pipelineUploadClient.UploadFile(
178172
"../resources/dag_status/parallel_for_failure.yaml",
179-
uploadParams.NewUploadPipelineParams(),
173+
&uploadParams.UploadPipelineParams{
174+
Name: util.StringPointer("parallel-for-failure-test"),
175+
DisplayName: util.StringPointer("Parallel For Failure Test Pipeline"),
176+
},
180177
)
181178
require.NoError(t, err)
182179
require.NotNil(t, pipeline)
@@ -209,7 +206,10 @@ func (s *DAGStatusParallelForTestSuite) TestDynamicParallelFor() {
209206
210207
pipeline, err := s.pipelineUploadClient.UploadFile(
211208
"../resources/dag_status/parallel_for_dynamic.yaml",
212-
uploadParams.NewUploadPipelineParams(),
209+
&uploadParams.UploadPipelineParams{
210+
Name: util.StringPointer("parallel-for-dynamic-test"),
211+
DisplayName: util.StringPointer("Parallel For Dynamic Test Pipeline"),
212+
},
213213
)
214214
require.NoError(t, err)
215215
require.NotNil(t, pipeline)

0 commit comments

Comments
 (0)