mirror of
https://github.com/oxen-io/oxen-core.git
synced 2023-12-14 02:22:56 +01:00
Better timeout description
This commit is contained in:
parent
f071812d12
commit
e362a230ee
1 changed files with 6 additions and 2 deletions
|
@ -37,6 +37,7 @@ class MatchScreen:
|
||||||
self.callback = callback
|
self.callback = callback
|
||||||
self.allow_extra = allow_extra
|
self.allow_extra = allow_extra
|
||||||
self.fail_index = fail_index or len(self.regexes)
|
self.fail_index = fail_index or len(self.regexes)
|
||||||
|
self.desc = f"screen match: {regexes}"
|
||||||
|
|
||||||
def __call__(self, ledger, *, immediate=False):
|
def __call__(self, ledger, *, immediate=False):
|
||||||
text = ledger.curr()
|
text = ledger.curr()
|
||||||
|
@ -92,6 +93,7 @@ class MatchMulti:
|
||||||
self.expected = value
|
self.expected = value
|
||||||
self.re = re.compile("^" + re.escape(title) + r" \(1/(\d+)\)$")
|
self.re = re.compile("^" + re.escape(title) + r" \(1/(\d+)\)$")
|
||||||
self.callback = callback
|
self.callback = callback
|
||||||
|
self.desc = f"multi-value {title}"
|
||||||
|
|
||||||
def __call__(self, ledger, immediate=False):
|
def __call__(self, ledger, immediate=False):
|
||||||
text = ledger.curr()
|
text = ledger.curr()
|
||||||
|
@ -120,6 +122,7 @@ class Do:
|
||||||
self.action(ledger)
|
self.action(ledger)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
# Static Do objects that do a right/left/both push when invoked
|
# Static Do objects that do a right/left/both push when invoked
|
||||||
Do.right = Do(lambda ledger: ledger.right())
|
Do.right = Do(lambda ledger: ledger.right())
|
||||||
Do.left = Do(lambda ledger: ledger.left())
|
Do.left = Do(lambda ledger: ledger.left())
|
||||||
|
@ -153,10 +156,11 @@ def run_with_interactions(ledger, main, *interactions, timeout=30, poll=0.25):
|
||||||
break
|
break
|
||||||
time.sleep(poll)
|
time.sleep(poll)
|
||||||
else:
|
else:
|
||||||
|
desc = getattr(f, "desc", "device interaction")
|
||||||
if time.time() < timeout_at:
|
if time.time() < timeout_at:
|
||||||
raise TimeoutError("timeout waiting for device interactions")
|
raise EOFError("command finished before {desc} completed")
|
||||||
else:
|
else:
|
||||||
raise EOFError("command finished before device interactions completed")
|
raise TimeoutError(f"timeout waiting for {desc}")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
int_fail = e
|
int_fail = e
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue