Skip to content

Commit f5e6d20

Browse files
authored
Unskip update tests under java test server (#644)
1 parent dfc6e7f commit f5e6d20

File tree

1 file changed

+13
-71
lines changed

1 file changed

+13
-71
lines changed

tests/worker/test_workflow.py

+13-71
Original file line numberDiff line numberDiff line change
@@ -1486,7 +1486,7 @@ async def test_workflow_with_codec(client: Client, env: WorkflowEnvironment):
14861486
await test_workflow_signal_and_query(client)
14871487
await test_workflow_signal_and_query_errors(client)
14881488
await test_workflow_simple_activity(client)
1489-
await test_workflow_update_handlers_happy(client, env)
1489+
await test_workflow_update_handlers_happy(client)
14901490

14911491

14921492
class PassThroughCodec(PayloadCodec):
@@ -4262,11 +4262,7 @@ def throws_runtime_err(self) -> None:
42624262
raise RuntimeError("intentional failure")
42634263

42644264

4265-
async def test_workflow_update_handlers_happy(client: Client, env: WorkflowEnvironment):
4266-
if env.supports_time_skipping:
4267-
pytest.skip(
4268-
"Java test server: https://github.com/temporalio/sdk-java/issues/1903"
4269-
)
4265+
async def test_workflow_update_handlers_happy(client: Client):
42704266
async with new_worker(
42714267
client, UpdateHandlersWorkflow, activities=[say_hello]
42724268
) as worker:
@@ -4308,13 +4304,7 @@ async def test_workflow_update_handlers_happy(client: Client, env: WorkflowEnvir
43084304
)
43094305

43104306

4311-
async def test_workflow_update_handlers_unhappy(
4312-
client: Client, env: WorkflowEnvironment
4313-
):
4314-
if env.supports_time_skipping:
4315-
pytest.skip(
4316-
"Java test server: https://github.com/temporalio/sdk-java/issues/1903"
4317-
)
4307+
async def test_workflow_update_handlers_unhappy(client: Client):
43184308
async with new_worker(client, UpdateHandlersWorkflow) as worker:
43194309
handle = await client.start_workflow(
43204310
UpdateHandlersWorkflow.run,
@@ -4387,11 +4377,7 @@ async def test_workflow_update_handlers_unhappy(
43874377
assert "Rejected" == err.value.cause.message
43884378

43894379

4390-
async def test_workflow_update_task_fails(client: Client, env: WorkflowEnvironment):
4391-
if env.supports_time_skipping:
4392-
pytest.skip(
4393-
"Java test server: https://github.com/temporalio/sdk-java/issues/1903"
4394-
)
4380+
async def test_workflow_update_task_fails(client: Client):
43954381
# Need to not sandbox so behavior can change based on globals
43964382
async with new_worker(
43974383
client, UpdateHandlersWorkflow, workflow_runner=UnsandboxedWorkflowRunner()
@@ -4487,13 +4473,7 @@ def got_update(self) -> str:
44874473
return self._got_update
44884474

44894475

4490-
async def test_workflow_update_before_worker_start(
4491-
client: Client, env: WorkflowEnvironment
4492-
):
4493-
if env.supports_time_skipping:
4494-
pytest.skip(
4495-
"Java test server: https://github.com/temporalio/sdk-java/issues/1903"
4496-
)
4476+
async def test_workflow_update_before_worker_start(client: Client):
44974477
# In order to confirm that all started workflows get updates before the
44984478
# workflow completes, this test will start a workflow and start an update.
44994479
# Only then will it start the worker to process both in the task. The
@@ -4561,13 +4541,7 @@ async def signal(self) -> None:
45614541
self._complete_update = True
45624542

45634543

4564-
async def test_workflow_update_separate_handle(
4565-
client: Client, env: WorkflowEnvironment
4566-
):
4567-
if env.supports_time_skipping:
4568-
pytest.skip(
4569-
"Java test server: https://github.com/temporalio/sdk-java/issues/1903"
4570-
)
4544+
async def test_workflow_update_separate_handle(client: Client):
45714545
async with new_worker(client, UpdateSeparateHandleWorkflow) as worker:
45724546
# Start the workflow
45734547
handle = await client.start_workflow(
@@ -4609,14 +4583,7 @@ async def do_update(self, sleep: float) -> None:
46094583
await asyncio.sleep(sleep)
46104584

46114585

4612-
async def test_workflow_update_timeout_or_cancel(
4613-
client: Client, env: WorkflowEnvironment
4614-
):
4615-
if env.supports_time_skipping:
4616-
pytest.skip(
4617-
"Java test server: https://github.com/temporalio/sdk-java/issues/1903"
4618-
)
4619-
4586+
async def test_workflow_update_timeout_or_cancel(client: Client):
46204587
# Confirm start timeout via short timeout on update w/ no worker running
46214588
handle = await client.start_workflow(
46224589
UpdateTimeoutOrCancelWorkflow.run,
@@ -4906,14 +4873,7 @@ async def run(self, scenario: FailureTypesScenario) -> None:
49064873
await super().run(scenario)
49074874

49084875

4909-
async def test_workflow_failure_types_configured(
4910-
client: Client, env: WorkflowEnvironment
4911-
):
4912-
if env.supports_time_skipping:
4913-
pytest.skip(
4914-
"Java test server: https://github.com/temporalio/sdk-java/issues/1903"
4915-
)
4916-
4876+
async def test_workflow_failure_types_configured(client: Client):
49174877
# Asserter for a single scenario
49184878
async def assert_scenario(
49194879
workflow: Type[FailureTypesWorkflowBase],
@@ -5294,11 +5254,7 @@ async def get_update_id(self) -> str:
52945254
return info.id
52955255

52965256

5297-
async def test_workflow_current_update(client: Client, env: WorkflowEnvironment):
5298-
if env.supports_time_skipping:
5299-
pytest.skip(
5300-
"Java test server: https://github.com/temporalio/sdk-java/issues/1903"
5301-
)
5257+
async def test_workflow_current_update(client: Client):
53025258
async with new_worker(client, CurrentUpdateWorkflow) as worker:
53035259
handle = await client.start_workflow(
53045260
CurrentUpdateWorkflow.run,
@@ -5375,12 +5331,7 @@ async def my_signal_WARN_AND_ABANDON(self):
53755331
await self._do_update_or_signal()
53765332

53775333

5378-
async def test_unfinished_update_handler(client: Client, env: WorkflowEnvironment):
5379-
skip_unfinished_handler_tests_in_older_python()
5380-
if env.supports_time_skipping:
5381-
pytest.skip(
5382-
"Java test server: https://github.com/temporalio/sdk-java/issues/1903"
5383-
)
5334+
async def test_unfinished_update_handler(client: Client):
53845335
async with new_worker(client, UnfinishedHandlersWarningsWorkflow) as worker:
53855336
test = _UnfinishedHandlersWarningsTest(client, worker, "update")
53865337
await test.test_wait_all_handlers_finished_and_unfinished_handlers_warning()
@@ -5628,11 +5579,11 @@ async def test_unfinished_handler_on_workflow_termination(
56285579
"-cancellation-", "-failure-", "-continue-as-new-"
56295580
],
56305581
):
5631-
skip_unfinished_handler_tests_in_older_python()
5632-
if handler_type == "-update-" and env.supports_time_skipping:
5582+
if env.supports_time_skipping:
56335583
pytest.skip(
5634-
"Java test server: https://github.com/temporalio/sdk-java/issues/1903"
5584+
"Issues with update: https://github.com/temporalio/sdk-python/issues/826"
56355585
)
5586+
skip_unfinished_handler_tests_in_older_python()
56365587
await _UnfinishedHandlersOnWorkflowTerminationTest(
56375588
client,
56385589
handler_type,
@@ -5846,12 +5797,7 @@ async def my_update(self) -> str:
58465797

58475798
async def test_update_completion_is_honored_when_after_workflow_return_1(
58485799
client: Client,
5849-
env: WorkflowEnvironment,
58505800
):
5851-
if env.supports_time_skipping:
5852-
pytest.skip(
5853-
"Java test server: https://github.com/temporalio/sdk-java/issues/1903"
5854-
)
58555801
update_id = "my-update"
58565802
task_queue = "tq"
58575803
wf_handle = await client.start_workflow(
@@ -5904,10 +5850,6 @@ async def test_update_completion_is_honored_when_after_workflow_return_2(
59045850
client: Client,
59055851
env: WorkflowEnvironment,
59065852
):
5907-
if env.supports_time_skipping:
5908-
pytest.skip(
5909-
"Java test server: https://github.com/temporalio/sdk-java/issues/1903"
5910-
)
59115853
async with Worker(
59125854
client,
59135855
task_queue="tq",

0 commit comments

Comments
 (0)