Skip to content

Commit

Permalink
rename
Browse files Browse the repository at this point in the history
  • Loading branch information
pcrespov committed Sep 27, 2024
1 parent c724abe commit 811912b
Showing 1 changed file with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -230,13 +230,13 @@ def __call__(self, message: str) -> bool:
f"{json.dumps({k:round(v,1) for k,v in self._current_progress.items()})}",
)

return self.has_progress_on_all_expected_node_states() and all(
return self.received_required_node_progress_types() and all(
round(progress, 1) == 1.0
for progress in self._current_progress.values()
)
return False

def has_progress_on_all_expected_node_states(self):
def received_required_node_progress_types(self):
return all(
progress_type in self._current_progress
for progress_type in NodeProgressType.required_types_for_started_service()
Expand Down Expand Up @@ -338,14 +338,15 @@ def expected_service_running(
service_running = ServiceRunning(iframe_locator=None)

try:

with websocket.expect_event("framereceived", waiter, timeout=timeout):
if press_start_button:
_trigger_service_start(page, node_id)

yield service_running

except PlaywrightTimeoutError:
if waiter.has_progress_on_all_expected_node_states():
if waiter.received_required_node_progress_types():
ctx.logger.warning(
"⚠️ Progress bar didn't receive 100 percent but all states are there: %s ⚠️", # https://github.com/ITISFoundation/osparc-simcore/issues/6449
waiter.get_current_progress(),
Expand Down

0 comments on commit 811912b

Please sign in to comment.