val/irctest
1
0
Fork 0
mirror of https://github.com/progval/irctest.git synced 2025-04-05 06:49:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Need fanout > 1 when more than 2 nodes.

Browse Source 
And restore faketime config to previous value, as that wasn't the right fix
This commit is contained in:
Val Lorentz
2024-11-10 18:52:07 +01:00
parent 827c6a6df4
commit 0dc5a0fdda
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
irctest/controllers/sable.py
View File

@ -95,7 +95,7 @@ def certs_dir() -> Path:
NETWORK_CONFIG = """ NETWORK_CONFIG = """
{ {
"fanout": 1, "fanout": 2,
"ca_file": "%(certs_dir)s/ca_cert.pem", "ca_file": "%(certs_dir)s/ca_cert.pem",
"peers": [ "peers": [

19
irctest/server_tests/chathistory.py
View File

@ -868,10 +868,9 @@ assert {f"_validate_chathistory_{cmd}" for cmd in SUBCOMMANDS} == {
@cases.mark_specifications("Sable") @cases.mark_specifications("Sable")
@cases.mark_services @cases.mark_services
class SablePostgresqlHistoryTestCase(_BaseChathistoryTests): class SablePostgresqlHistoryTestCase(_BaseChathistoryTests):
# for every wall clock second, 10 seconds pass for the server. # for every wall clock second, 15 seconds pass for the server.
# At x15, sable_history does not always have time to persist messages (wtf?)
# at x30, links between nodes timeout. # at x30, links between nodes timeout.
faketime = "+1y x10" faketime = "+1y x15"
@staticmethod @staticmethod
def config() -> cases.TestCaseControllerConfig: def config() -> cases.TestCaseControllerConfig:
@ -881,22 +880,24 @@ class SablePostgresqlHistoryTestCase(_BaseChathistoryTests):
) )
def _wait_before_chathistory(self): def _wait_before_chathistory(self):
"""waits 15 seconds which appears to be a 1.5 min to Sable; which goes over """waits 6 seconds which appears to be a 1.5 min to Sable; which goes over
the 1 min timeout for in-memory history""" the 1 min timeout for in-memory history (+ 1 min because the cleanup job
only runs every min)"""
assert self.controller.faketime_enabled, "faketime is not installed" assert self.controller.faketime_enabled, "faketime is not installed"
time.sleep(15) time.sleep(8)
@cases.mark_specifications("Sable") @cases.mark_specifications("Sable")
@cases.mark_services @cases.mark_services
class SableExpiringHistoryTestCase(cases.BaseServerTestCase): class SableExpiringHistoryTestCase(cases.BaseServerTestCase):
faketime = "+1y x10" faketime = "+1y x15"
def _wait_before_chathistory(self): def _wait_before_chathistory(self):
"""waits 6 seconds which appears to be a 1.5 min to Sable; which goes over """waits 6 seconds which appears to be a 1.5 min to Sable; which goes over
the 1 min timeout for in-memory history""" the 1 min timeout for in-memory history (+ 1 min because the cleanup job
only runs every min)"""
assert self.controller.faketime_enabled, "faketime is not installed" assert self.controller.faketime_enabled, "faketime is not installed"
time.sleep(15) time.sleep(8)
def testChathistoryExpired(self): def testChathistoryExpired(self):
"""Checks that Sable forgets about messages if the history server is not available""" """Checks that Sable forgets about messages if the history server is not available"""