config reload: rename-safe (watch dir not file, react to moved/created not just modified) — cfg-05
This commit is contained in:
+29
-6
@@ -120,9 +120,7 @@ class TestConfigReloadRace(TestBotBase):
|
||||
new_config["history-limit"] = 99
|
||||
self.bot.load_config = lambda path: new_config
|
||||
self.bot.loop = MagicMock()
|
||||
event = MagicMock()
|
||||
event.src_path = self.bot.config_file
|
||||
self.bot.on_config_file_modified(event)
|
||||
self.bot.on_config_file_changed()
|
||||
self.bot.loop.call_soon_threadsafe.assert_called_once()
|
||||
apply_fn = self.bot.loop.call_soon_threadsafe.call_args.args[0]
|
||||
apply_fn()
|
||||
@@ -137,7 +135,32 @@ class TestConfigReloadRace(TestBotBase):
|
||||
loop = MagicMock()
|
||||
loop.call_soon_threadsafe.side_effect = RuntimeError("no running loop")
|
||||
self.bot.loop = loop
|
||||
event = MagicMock()
|
||||
event.src_path = self.bot.config_file
|
||||
self.bot.on_config_file_modified(event)
|
||||
self.bot.on_config_file_changed()
|
||||
self.assertEqual(self.bot.config["history-limit"], 42)
|
||||
|
||||
|
||||
class TestConfigReloadRenameSafe(unittest.TestCase):
|
||||
def test_atomic_rename_and_modify_trigger_reload(self):
|
||||
"""CFG-05: a modified OR a renamed-into-place config fires the reload; unrelated files do not."""
|
||||
from fjerkroa_bot.discord_bot import ConfigFileHandler
|
||||
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
config = Path(tmp) / "kroa.toml"
|
||||
config.write_text("x = 1\n")
|
||||
hits = []
|
||||
handler = ConfigFileHandler(str(config), lambda: hits.append(1))
|
||||
|
||||
def evt(is_dir=False, src=None, dest=None):
|
||||
event = MagicMock()
|
||||
event.is_directory = is_dir
|
||||
event.src_path = src if src is not None else ""
|
||||
event.dest_path = dest if dest is not None else ""
|
||||
return event
|
||||
|
||||
handler.on_any_event(evt(src=str(config))) # in-place modify
|
||||
handler.on_any_event(evt(src=str(Path(tmp) / "kroa.toml.tmp"), dest=str(config))) # atomic rename over
|
||||
self.assertEqual(len(hits), 2)
|
||||
|
||||
handler.on_any_event(evt(src=str(Path(tmp) / "other.txt"))) # unrelated file
|
||||
handler.on_any_event(evt(is_dir=True, src=str(config))) # directory event
|
||||
self.assertEqual(len(hits), 2) # neither fired
|
||||
|
||||
Reference in New Issue
Block a user