Skip to content

Commit

Permalink
ci: implemented changes
Browse files Browse the repository at this point in the history
  • Loading branch information
moe-ad committed Feb 5, 2025
1 parent cf1ba1c commit dcd356f
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
9 changes: 9 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,15 @@ jobs:
command: |
tox run-parallel -m ciparalleltests ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }}
- name: "Test API test_server"
uses: nick-fields/retry@v3
with:
timeout_minutes: 10
max_attempts: 2
shell: bash
command: |
tox -e test-server,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }}
- name: "Test API test_remote_workflow"
uses: nick-fields/retry@v3
with:
Expand Down
1 change: 0 additions & 1 deletion tests/entry/test_entry.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ def test_apply_context_remote(remote_config_server_type):

@pytest.mark.order(5)
@conftest.raises_for_servers_version_under("4.0")
@pytest.mark.skip(reason="affecting parallel runs in CI")
def test_runtime_client_no_server(remote_config_server_type):
dpf.server.shutdown_all_session_servers()
dpf.SERVER_CONFIGURATION = remote_config_server_type
Expand Down
2 changes: 0 additions & 2 deletions tests/test_data_tree.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,6 @@ def test_write_data_tree():


@conftest.raises_for_servers_version_under("4.0")
@pytest.mark.skip(reason="affecting parallel runs in CI")
def test_write_to_file_data_tree(tmpdir, server_type):
data_tree = dpf.DataTree(server=server_type)
with data_tree.to_fill() as to_fill:
Expand Down Expand Up @@ -232,7 +231,6 @@ def test_write_to_file_remote_data_tree(tmpdir, server_clayer_remote_process):


@conftest.raises_for_servers_version_under("4.0")
@pytest.mark.skip(reason="affecting parallel runs in CI")
def test_read_from_txt_data_tree(server_type):
data_tree = dpf.DataTree(server=server_type)
with data_tree.to_fill() as to_fill:
Expand Down
2 changes: 0 additions & 2 deletions tests/test_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ def test_shutdown_all_session_servers(self, server_config):
shutdown_all_session_servers()
assert not has_local_server()

@pytest.mark.skip(reason="affecting parallel runs in CI")
def test_start_shutdown_start(self, server_config):
set_server_configuration(server_config)
# print(dpf.core.SERVER_CONFIGURATION)
Expand Down Expand Up @@ -321,7 +320,6 @@ def test_go_away_server():
reason="Not existing in version lower than 4.0",
)
@pytest.mark.skipif(running_docker, reason="Unstable on Docker")
@pytest.mark.skip(reason="affecting parallel runs in CI")
def test_start_after_shutting_down_server():
remote_server = start_local_server(
config=dpf.core.AvailableServerConfigs.GrpcServer, as_global=False
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ envlist = pretest,test-{api,launcher,server,local_server,multi_server,api_entry,

labels =
othertests = pretest,test-{workflow,remote_workflow,remote_operator,service},posttest,kill-servers
ciparalleltests = test-{api,launcher,server,local_server,multi_server,api_entry,custom_type_field,operators},kill-servers
ciparalleltests = test-{api,launcher,local_server,multi_server,api_entry,custom_type_field,operators},kill-servers

isolated_build_env = build

Expand Down

0 comments on commit dcd356f

Please sign in to comment.