Skip to content

Commit c724abe

Browse files
committed
minor modifications
1 parent bb0115b commit c724abe

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

packages/pytest-simcore/src/pytest_simcore/helpers/playwright.py

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ def __call__(self, message: str) -> None:
196196
class SocketIONodeProgressCompleteWaiter:
197197
node_id: str
198198
logger: logging.Logger
199-
_last_call_return: bool = False
200199
_current_progress: dict[NodeProgressType, float] = field(
201200
default_factory=defaultdict
202201
)
@@ -224,24 +223,24 @@ def __call__(self, message: str) -> bool:
224223
self._current_progress[
225224
node_progress_event.progress_type
226225
] = new_progress
226+
227227
self.logger.info(
228-
"current startup progress: %s",
228+
"Current startup progress [expected number of states=%d]: %s",
229+
NodeProgressType.required_types_for_started_service(),
229230
f"{json.dumps({k:round(v,1) for k,v in self._current_progress.items()})}",
230231
)
231232

232-
self._last_call_return = all(
233-
progress_type in self._current_progress
234-
for progress_type in NodeProgressType.required_types_for_started_service()
235-
) and all(
233+
return self.has_progress_on_all_expected_node_states() and all(
236234
round(progress, 1) == 1.0
237235
for progress in self._current_progress.values()
238236
)
239-
return self._last_call_return
240-
self._last_call_return = False
241237
return False
242238

243-
def get_last_call_return(self):
244-
return self._last_call_return
239+
def has_progress_on_all_expected_node_states(self):
240+
return all(
241+
progress_type in self._current_progress
242+
for progress_type in NodeProgressType.required_types_for_started_service()
243+
)
245244

246245
def get_current_progress(self):
247246
return self._current_progress.values()
@@ -346,9 +345,9 @@ def expected_service_running(
346345
yield service_running
347346

348347
except PlaywrightTimeoutError:
349-
if waiter.get_last_call_return() is False:
348+
if waiter.has_progress_on_all_expected_node_states():
350349
ctx.logger.warning(
351-
"⚠️ Progress bar didn't receive 100 percent: %s ⚠️", # https://github.com/ITISFoundation/osparc-simcore/issues/6449
350+
"⚠️ Progress bar didn't receive 100 percent but all states are there: %s ⚠️", # https://github.com/ITISFoundation/osparc-simcore/issues/6449
352351
waiter.get_current_progress(),
353352
)
354353
else:

0 commit comments

Comments
 (0)