Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🎨 Rabbitmq/only listens to logs if needed #4180

Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix test variable
  • Loading branch information
sanderegg committed May 8, 2023
commit b0ebfe935a39b9961d09de75ce1f692961295848
Original file line number Diff line number Diff line change
@@ -356,9 +356,7 @@ async def test_open_project(
),
)
)
mocked_director_v2_api["director_v2.api.run_dynamic_service"].assert_has_calls(
calls
)
mocked_director_v2_api["run_dynamic_service"].assert_has_calls(calls)
else:
mocked_notifications_plugin["subscribe"].assert_not_called()

@@ -427,9 +425,7 @@ async def test_open_template_project_for_edition(
product_name=osparc_product_name,
)
)
mocked_director_v2_api["director_v2.api.run_dynamic_service"].assert_has_calls(
calls
)
mocked_director_v2_api["run_dynamic_service"].assert_has_calls(calls)
else:
mocked_notifications_plugin["subscribe"].assert_not_called()

@@ -494,7 +490,7 @@ async def test_open_project_with_small_amount_of_dynamic_services_starts_them_au
project = await user_project_with_num_dynamic_services(num_of_dyn_services)
all_service_uuids = list(project["workbench"])
for num_service_already_running in range(num_of_dyn_services):
mocked_director_v2_api["director_v2.api.list_dynamic_services"].return_value = [
mocked_director_v2_api["list_dynamic_services"].return_value = [
{"service_uuid": all_service_uuids[service_id]}
for service_id in range(num_service_already_running)
]
@@ -506,10 +502,10 @@ async def test_open_project_with_small_amount_of_dynamic_services_starts_them_au
client.app, ProjectID(project["uuid"])
)
mocked_notifications_plugin["subscribe"].reset_mock()
assert mocked_director_v2_api[
"director_v2.api.run_dynamic_service"
].call_count == (num_of_dyn_services - num_service_already_running)
mocked_director_v2_api["director_v2.api.run_dynamic_service"].reset_mock()
assert mocked_director_v2_api["run_dynamic_service"].call_count == (
num_of_dyn_services - num_service_already_running
)
mocked_director_v2_api["run_dynamic_service"].reset_mock()


@pytest.mark.parametrize(*standard_user_role())
@@ -532,7 +528,7 @@ async def test_open_project_with_disable_service_auto_start_set_overrides_behavi
project = await user_project_with_num_dynamic_services(num_of_dyn_services)
all_service_uuids = list(project["workbench"])
for num_service_already_running in range(num_of_dyn_services):
mocked_director_v2_api["director_v2.api.list_dynamic_services"].return_value = [
mocked_director_v2_api["list_dynamic_services"].return_value = [
{"service_uuid": all_service_uuids[service_id]}
for service_id in range(num_service_already_running)
]
@@ -549,9 +545,7 @@ async def test_open_project_with_disable_service_auto_start_set_overrides_behavi
client.app, ProjectID(project["uuid"])
)
mocked_notifications_plugin["subscribe"].reset_mock()
mocked_director_v2_api[
"director_v2.api.run_dynamic_service"
].assert_not_called()
mocked_director_v2_api["run_dynamic_service"].assert_not_called()


@pytest.mark.parametrize(*standard_user_role())
@@ -573,7 +567,7 @@ async def test_open_project_with_large_amount_of_dynamic_services_does_not_start
)
all_service_uuids = list(project["workbench"])
for num_service_already_running in range(max_amount_of_auto_started_dyn_services):
mocked_director_v2_api["director_v2.api.list_dynamic_services"].return_value = [
mocked_director_v2_api["list_dynamic_services"].return_value = [
{"service_uuid": all_service_uuids[service_id]}
for service_id in range(num_service_already_running)
]
@@ -584,9 +578,7 @@ async def test_open_project_with_large_amount_of_dynamic_services_does_not_start
client.app, ProjectID(project["uuid"])
)
mocked_notifications_plugin["subscribe"].reset_mock()
mocked_director_v2_api[
"director_v2.api.run_dynamic_service"
].assert_not_called()
mocked_director_v2_api["run_dynamic_service"].assert_not_called()


@pytest.mark.parametrize(*standard_user_role())
@@ -614,7 +606,7 @@ async def test_open_project_with_large_amount_of_dynamic_services_starts_them_if
project = await user_project_with_num_dynamic_services(num_of_dyn_services + 1)
all_service_uuids = list(project["workbench"])
for num_service_already_running in range(num_of_dyn_services):
mocked_director_v2_api["director_v2.api.list_dynamic_services"].return_value = [
mocked_director_v2_api["list_dynamic_services"].return_value = [
{"service_uuid": all_service_uuids[service_id]}
for service_id in range(num_service_already_running)
]
@@ -917,18 +909,14 @@ async def test_project_node_lifetime(
data, errors = await assert_status(resp, expected_response_on_Create)
node_id = None
if resp.status == web.HTTPCreated.status_code:
mocked_director_v2_api[
"director_v2.api.run_dynamic_service"
].assert_called_once()
mocked_director_v2_api["run_dynamic_service"].assert_called_once()
assert "node_id" in data
node_id = data["node_id"]
else:
mocked_director_v2_api[
"director_v2.api.run_dynamic_service"
].assert_not_called()
mocked_director_v2_api["run_dynamic_service"].assert_not_called()

# create a new NOT dynamic node...
mocked_director_v2_api["director_v2.api.run_dynamic_service"].reset_mock()
mocked_director_v2_api["run_dynamic_service"].reset_mock()
url = client.app.router["create_node"].url_for(project_id=user_project["uuid"])
body = {
"service_key": "simcore/services/comp/key",
@@ -938,18 +926,14 @@ async def test_project_node_lifetime(
data, errors = await assert_status(resp, expected_response_on_Create)
node_id_2 = None
if resp.status == web.HTTPCreated.status_code:
mocked_director_v2_api[
"director_v2.api.run_dynamic_service"
].assert_not_called()
mocked_director_v2_api["run_dynamic_service"].assert_not_called()
assert "node_id" in data
node_id_2 = data["node_id"]
else:
mocked_director_v2_api[
"director_v2.api.run_dynamic_service"
].assert_not_called()
mocked_director_v2_api["run_dynamic_service"].assert_not_called()

# get the node state
mocked_director_v2_api["director_v2.api.list_dynamic_services"].return_value = [
mocked_director_v2_api["list_dynamic_services"].return_value = [
{"service_uuid": node_id, "service_state": "running"}
]
url = client.app.router["get_node"].url_for(
@@ -965,7 +949,7 @@ async def test_project_node_lifetime(
assert data["service_state"] == "running"

# get the NOT dynamic node state
mocked_director_v2_api["director_v2.api.list_dynamic_services"].return_value = []
mocked_director_v2_api["list_dynamic_services"].return_value = []

url = client.app.router["get_node"].url_for(
project_id=user_project["uuid"], node_id=node_id_2
@@ -980,7 +964,7 @@ async def test_project_node_lifetime(
assert data["service_state"] == "idle"

# delete the node
mocked_director_v2_api["director_v2.api.list_dynamic_services"].return_value = [
mocked_director_v2_api["list_dynamic_services"].return_value = [
{"service_uuid": node_id}
]
url = client.app.router["delete_node"].url_for(