From 63def483a1d14dc20e0f2fa07dd8f6e3a5907ed2 Mon Sep 17 00:00:00 2001 From: Val Lorentz Date: Sat, 28 Dec 2024 17:56:47 +0100 Subject: [PATCH] Update Sable and make LINKS test support it --- .github/workflows/test-stable.yml | 2 +- irctest/server_tests/links.py | 11 +++++++++-- workflows.yml | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-stable.yml b/.github/workflows/test-stable.yml index 76ef5a6c..d0443fdf 100644 --- a/.github/workflows/test-stable.yml +++ b/.github/workflows/test-stable.yml @@ -1140,7 +1140,7 @@ jobs: uses: actions/checkout@v4 with: path: sable - ref: 52397dc9e0f27c3ed197f984c00f06639870716d + ref: baed3ef9ac4550dc36a45b758436769e82e8ec58 repository: Libera-Chat/sable - name: Install rust toolchain uses: actions-rs/toolchain@v1 diff --git a/irctest/server_tests/links.py b/irctest/server_tests/links.py index a8b007f0..00a4905c 100644 --- a/irctest/server_tests/links.py +++ b/irctest/server_tests/links.py @@ -3,6 +3,13 @@ from irctest.patma import ANYSTR, StrRe +def _server_info_regexp(case: cases.BaseServerTestCase) -> str: + if case.controller.software_name == "Sable": + return ".+" + else: + return "test server" + + class LinksTestCase(cases.BaseServerTestCase): @cases.mark_specifications("RFC1459", "RFC2812", "Modern") def testLinksSingleServer(self): @@ -56,7 +63,7 @@ def testLinksSingleServer(self): "nick", "My.Little.Server", "My.Little.Server", - StrRe("0 (0042 )?test server"), + StrRe(f"0 (0042 )?{_server_info_regexp(self)}"), ], ) @@ -119,7 +126,7 @@ def testLinksWithServices(self): "nick", "My.Little.Server", "My.Little.Server", - StrRe("0 (0042 )?test server"), + StrRe(f"0 (0042 )?{_server_info_regexp(self)}"), ], ) self.assertMessageMatch( diff --git a/workflows.yml b/workflows.yml index fbf7b951..dfc8c6c2 100644 --- a/workflows.yml +++ b/workflows.yml @@ -249,7 +249,7 @@ software: name: Sable repository: Libera-Chat/sable refs: - stable: 52397dc9e0f27c3ed197f984c00f06639870716d + stable: baed3ef9ac4550dc36a45b758436769e82e8ec58 release: null devel: master devel_release: null