Skip to content

Commit

Permalink
Increase some test timeouts (#6638)
Browse files Browse the repository at this point in the history
We were having failures on our macos-aarch64 release test runner, so I
bumped some timeouts in 3.x and they fixed it. It turns out that
runner was running in a heavily degraded state, so probably shouldn't
have needed these timeouts increased, but they still seem a little low
so I'm forward porting anyway.

Also bump the timeout that failed on the test run *after* I changed
those.
  • Loading branch information
msullivan authored Dec 22, 2023
1 parent c3e3296 commit ff8c68d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion edb/testbase/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -2034,7 +2034,7 @@ async def wait_for_server_readiness(self, stream: asyncio.StreamReader):
async def kill_process(self, proc: asyncio.Process):
proc.terminate()
try:
await asyncio.wait_for(proc.wait(), timeout=20)
await asyncio.wait_for(proc.wait(), timeout=60)
except TimeoutError:
proc.kill()

Expand Down
2 changes: 1 addition & 1 deletion tests/test_pgext.py
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ def connection_lost(self, exc):
self.messages.put_nowait(None)

async def read(self, expect=None):
rv = await asyncio.wait_for(self.messages.get(), 5)
rv = await asyncio.wait_for(self.messages.get(), 60)
if expect is not None and not isinstance(rv, expect):
raise AssertionError(f"expect {expect}, got {rv}")
return rv
Expand Down
2 changes: 1 addition & 1 deletion tests/test_server_concurrency.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ async def transaction1(con, f):
transaction1(con, f1),
transaction1(con2, f2),
return_exceptions=True,
), 10)
), 60)
for e in results:
if isinstance(e, BaseException):
raise e
Expand Down

0 comments on commit ff8c68d

Please sign in to comment.