Skip to content

Commit 4814493

Browse files
guzzijonesguzzijones
committed
black fixes for contrib
1 parent 09188f7 commit 4814493

7 files changed

Lines changed: 56 additions & 46 deletions

File tree

‎contrib/runners/orquesta_runner/orquesta_runner/orquesta_runner.py‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,20 @@ def start_workflow(self, action_parameters):
138138
except wf_exc.WorkflowInspectionError as e:
139139
_, ex, tb = sys.exc_info()
140140
status = ac_const.LIVEACTION_STATUS_FAILED
141-
result = {"errors": e.args[1], "output": None, "traceback": "".join(traceback.format_tb(tb, 20))}
141+
result = {
142+
"errors": e.args[1],
143+
"output": None,
144+
"traceback": "".join(traceback.format_tb(tb, 20)),
145+
}
142146
return (status, result, self.context)
143147
except Exception as e:
144148
_, ex, tb = sys.exc_info()
145149
status = ac_const.LIVEACTION_STATUS_FAILED
146-
result = {"errors": [{"message": six.text_type(e)}], "output": None,
147-
"traceback": "".join(traceback.format_tb(tb, 20))}
150+
result = {
151+
"errors": [{"message": six.text_type(e)}],
152+
"output": None,
153+
"traceback": "".join(traceback.format_tb(tb, 20)),
154+
}
148155
return (status, result, self.context)
149156

150157
return self._handle_workflow_return_value(wf_ex_db)

‎contrib/runners/orquesta_runner/tests/unit/test_cancel.py‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,7 @@ def test_cancel_workflow_cascade_down_to_subworkflow(self):
139139
)
140140
self.assertEqual(len(tk_ac_ex_dbs), 1)
141141

142-
tk_lv_ac_db = lv_db_access.LiveAction.get_by_id(
143-
tk_ac_ex_dbs[0].liveaction
144-
)
142+
tk_lv_ac_db = lv_db_access.LiveAction.get_by_id(tk_ac_ex_dbs[0].liveaction)
145143
self.assertEqual(tk_lv_ac_db.status, ac_const.LIVEACTION_STATUS_RUNNING)
146144

147145
# Cancel the main workflow.
@@ -182,9 +180,7 @@ def test_cancel_subworkflow_cascade_up_to_workflow(self):
182180
)
183181
self.assertEqual(len(tk_ac_ex_dbs), 1)
184182

185-
tk_lv_ac_db = lv_db_access.LiveAction.get_by_id(
186-
tk_ac_ex_dbs[0].liveaction
187-
)
183+
tk_lv_ac_db = lv_db_access.LiveAction.get_by_id(tk_ac_ex_dbs[0].liveaction)
188184
self.assertEqual(tk_lv_ac_db.status, ac_const.LIVEACTION_STATUS_RUNNING)
189185

190186
# Cancel the subworkflow.
@@ -230,19 +226,15 @@ def test_cancel_subworkflow_cascade_up_to_workflow_with_other_subworkflows(self)
230226
)
231227
self.assertEqual(len(tk1_ac_ex_dbs), 1)
232228

233-
tk1_lv_ac_db = lv_db_access.LiveAction.get_by_id(
234-
tk1_ac_ex_dbs[0].liveaction
235-
)
229+
tk1_lv_ac_db = lv_db_access.LiveAction.get_by_id(tk1_ac_ex_dbs[0].liveaction)
236230
self.assertEqual(tk1_lv_ac_db.status, ac_const.LIVEACTION_STATUS_RUNNING)
237231

238232
tk2_ac_ex_dbs = ex_db_access.ActionExecution.query(
239233
task_execution=str(tk_ex_dbs[1].id)
240234
)
241235
self.assertEqual(len(tk2_ac_ex_dbs), 1)
242236

243-
tk2_lv_ac_db = lv_db_access.LiveAction.get_by_id(
244-
tk2_ac_ex_dbs[0].liveaction
245-
)
237+
tk2_lv_ac_db = lv_db_access.LiveAction.get_by_id(tk2_ac_ex_dbs[0].liveaction)
246238
self.assertEqual(tk2_lv_ac_db.status, ac_const.LIVEACTION_STATUS_RUNNING)
247239

248240
# Cancel the subworkflow which should cascade up to the root.

‎contrib/runners/orquesta_runner/tests/unit/test_error_handling.py‎

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -367,10 +367,18 @@ def test_fail_start_task_input_value_type(self):
367367
workflow_execution=str(wf_ex_db.id)
368368
)[0]
369369
self.assertEqual(tk_ex_db.status, wf_statuses.FAILED)
370-
self.assertEqual(tk_ex_db.result["errors"][0]["type"], expected_errors[0]["type"])
371-
self.assertEqual(tk_ex_db.result["errors"][0]["message"], expected_errors[0]["message"])
372-
self.assertEqual(tk_ex_db.result["errors"][0]["task_id"], expected_errors[0]["task_id"])
373-
self.assertEqual(tk_ex_db.result["errors"][0]["route"], expected_errors[0]["route"])
370+
self.assertEqual(
371+
tk_ex_db.result["errors"][0]["type"], expected_errors[0]["type"]
372+
)
373+
self.assertEqual(
374+
tk_ex_db.result["errors"][0]["message"], expected_errors[0]["message"]
375+
)
376+
self.assertEqual(
377+
tk_ex_db.result["errors"][0]["task_id"], expected_errors[0]["task_id"]
378+
)
379+
self.assertEqual(
380+
tk_ex_db.result["errors"][0]["route"], expected_errors[0]["route"]
381+
)
374382

375383
lv_ac_db = lv_db_access.LiveAction.get_by_id(str(lv_ac_db.id))
376384
self.assertEqual(lv_ac_db.status, ac_const.LIVEACTION_STATUS_FAILED)
@@ -533,24 +541,36 @@ def test_fail_next_task_input_value_type(self):
533541
wf_ex_db = wf_db_access.WorkflowExecution.get_by_id(str(wf_ex_db.id))
534542
self.assertEqual(wf_ex_db.status, wf_statuses.FAILED)
535543
self.assertEqual(
536-
self.sort_workflow_errors(wf_ex_db.errors)[0]["type"], expected_errors[0]["type"]
544+
self.sort_workflow_errors(wf_ex_db.errors)[0]["type"],
545+
expected_errors[0]["type"],
537546
)
538547
self.assertEqual(
539-
self.sort_workflow_errors(wf_ex_db.errors)[0]["message"], expected_errors[0]["message"]
548+
self.sort_workflow_errors(wf_ex_db.errors)[0]["message"],
549+
expected_errors[0]["message"],
540550
)
541551
self.assertEqual(
542-
self.sort_workflow_errors(wf_ex_db.errors)[0]["task_id"], expected_errors[0]["task_id"]
552+
self.sort_workflow_errors(wf_ex_db.errors)[0]["task_id"],
553+
expected_errors[0]["task_id"],
543554
)
544555
self.assertEqual(
545-
self.sort_workflow_errors(wf_ex_db.errors)[0]["route"], expected_errors[0]["route"]
556+
self.sort_workflow_errors(wf_ex_db.errors)[0]["route"],
557+
expected_errors[0]["route"],
546558
)
547559

548560
tk2_ex_db = wf_db_access.TaskExecution.query(task_id="task2")[0]
549561
self.assertEqual(tk2_ex_db.status, wf_statuses.FAILED)
550-
self.assertEqual(tk2_ex_db.result["errors"][0]["type"], expected_errors[0]["type"])
551-
self.assertEqual(tk2_ex_db.result["errors"][0]["message"], expected_errors[0]["message"])
552-
self.assertEqual(tk2_ex_db.result["errors"][0]["task_id"], expected_errors[0]["task_id"])
553-
self.assertEqual(tk2_ex_db.result["errors"][0]["route"], expected_errors[0]["route"])
562+
self.assertEqual(
563+
tk2_ex_db.result["errors"][0]["type"], expected_errors[0]["type"]
564+
)
565+
self.assertEqual(
566+
tk2_ex_db.result["errors"][0]["message"], expected_errors[0]["message"]
567+
)
568+
self.assertEqual(
569+
tk2_ex_db.result["errors"][0]["task_id"], expected_errors[0]["task_id"]
570+
)
571+
self.assertEqual(
572+
tk2_ex_db.result["errors"][0]["route"], expected_errors[0]["route"]
573+
)
554574

555575
lv_ac_db = lv_db_access.LiveAction.get_by_id(str(lv_ac_db.id))
556576
self.assertEqual(lv_ac_db.status, ac_const.LIVEACTION_STATUS_FAILED)

‎contrib/runners/orquesta_runner/tests/unit/test_functions_task.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,7 @@ def _execute_workflow(
129129
tk_ac_ex_db = ex_db_access.ActionExecution.query(
130130
task_execution=str(tk_ex_db.id)
131131
)[0]
132-
tk_lv_ac_db = lv_db_access.LiveAction.get_by_id(
133-
tk_ac_ex_db.liveaction
134-
)
132+
tk_lv_ac_db = lv_db_access.LiveAction.get_by_id(tk_ac_ex_db.liveaction)
135133

136134
self.assertEqual(tk_lv_ac_db.status, ac_const.LIVEACTION_STATUS_SUCCEEDED)
137135
self.assertTrue(

‎contrib/runners/orquesta_runner/tests/unit/test_inquiries.py‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -493,9 +493,7 @@ def test_nested_inquiry(self):
493493
t2_t1_ac_ex_db = ex_db_access.ActionExecution.query(
494494
task_execution=str(t2_t1_ex_db.id)
495495
)[0]
496-
t2_t1_lv_ac_db = lv_db_access.LiveAction.get_by_id(
497-
t2_t1_ac_ex_db.liveaction
498-
)
496+
t2_t1_lv_ac_db = lv_db_access.LiveAction.get_by_id(t2_t1_ac_ex_db.liveaction)
499497
self.assertEqual(
500498
t2_t1_lv_ac_db.status, action_constants.LIVEACTION_STATUS_SUCCEEDED
501499
)
@@ -514,9 +512,7 @@ def test_nested_inquiry(self):
514512
t2_t2_ac_ex_db = ex_db_access.ActionExecution.query(
515513
task_execution=str(t2_t2_ex_db.id)
516514
)[0]
517-
t2_t2_lv_ac_db = lv_db_access.LiveAction.get_by_id(
518-
t2_t2_ac_ex_db.liveaction
519-
)
515+
t2_t2_lv_ac_db = lv_db_access.LiveAction.get_by_id(t2_t2_ac_ex_db.liveaction)
520516
self.assertEqual(
521517
t2_t2_lv_ac_db.status, action_constants.LIVEACTION_STATUS_PENDING
522518
)
@@ -568,9 +564,7 @@ def test_nested_inquiry(self):
568564
t2_t3_ac_ex_db = ex_db_access.ActionExecution.query(
569565
task_execution=str(t2_t3_ex_db.id)
570566
)[0]
571-
t2_t3_lv_ac_db = lv_db_access.LiveAction.get_by_id(
572-
t2_t3_ac_ex_db.liveaction
573-
)
567+
t2_t3_lv_ac_db = lv_db_access.LiveAction.get_by_id(t2_t3_ac_ex_db.liveaction)
574568
self.assertEqual(
575569
t2_t3_lv_ac_db.status, action_constants.LIVEACTION_STATUS_SUCCEEDED
576570
)

‎contrib/runners/orquesta_runner/tests/unit/test_notify.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,10 @@ def test_notify_task_list_nonexistent_task(self):
235235
}
236236

237237
self.assertEqual(lv_ac_db.status, action_constants.LIVEACTION_STATUS_FAILED)
238-
self.assertEqual(lv_ac_db.result["errors"][0]["message"], expected_result["errors"][0]["message"])
238+
self.assertEqual(
239+
lv_ac_db.result["errors"][0]["message"],
240+
expected_result["errors"][0]["message"],
241+
)
239242
self.assertIsNone(lv_ac_db.result["output"], expected_result["output"])
240243

241244
def test_notify_task_list_item_value(self):

‎contrib/runners/orquesta_runner/tests/unit/test_pause_and_resume.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,7 @@ def test_pause_subworkflow_not_cascade_up_to_workflow(self):
153153
)
154154
self.assertEqual(len(tk_ac_ex_dbs), 1)
155155

156-
tk_lv_ac_db = lv_db_access.LiveAction.get_by_id(
157-
tk_ac_ex_dbs[0].liveaction
158-
)
156+
tk_lv_ac_db = lv_db_access.LiveAction.get_by_id(tk_ac_ex_dbs[0].liveaction)
159157
self.assertEqual(tk_lv_ac_db.status, ac_const.LIVEACTION_STATUS_RUNNING)
160158

161159
# Pause the subworkflow.
@@ -491,9 +489,7 @@ def test_resume(self):
491489
tk_ac_ex_dbs = ex_db_access.ActionExecution.query(
492490
task_execution=str(tk_ex_dbs[0].id)
493491
)
494-
tk_lv_ac_db = lv_db_access.LiveAction.get_by_id(
495-
tk_ac_ex_dbs[0].liveaction
496-
)
492+
tk_lv_ac_db = lv_db_access.LiveAction.get_by_id(tk_ac_ex_dbs[0].liveaction)
497493
self.assertEqual(tk_ac_ex_dbs[0].status, ac_const.LIVEACTION_STATUS_SUCCEEDED)
498494
self.assertEqual(tk_lv_ac_db.status, ac_const.LIVEACTION_STATUS_SUCCEEDED)
499495
wf_svc.handle_action_execution_completion(tk_ac_ex_dbs[0])

0 commit comments

Comments
 (0)