Skip to content

Commit 4983db7

Browse files
authored
Merge branch 'master' into sable-pg-history
2 parents a9c87ea + 2680502 commit 4983db7

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,12 @@ LIMNORIA_SELECTORS := \
8585
$(EXTRA_SELECTORS)
8686

8787
# Tests marked with arbitrary_client_tags or react_tag can't pass because Sable does not support client tags yet
88-
# Tests marked with private_chathistory can't pass because Sable does not implement CHATHISTORY for DMs
89-
9088
SABLE_SELECTORS := \
9189
(Sable or not implementation-specific) \
9290
and not deprecated \
9391
and not strict \
9492
and not arbitrary_client_tags \
9593
and not react_tag \
96-
and not private_chathistory \
9794
and not list and not lusers and not time and not info \
9895
$(EXTRA_SELECTORS)
9996

irctest/controllers/inspircd.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
class="ServerOperators"
3434
>
3535
36-
<options casemapping="ascii">
36+
<options casemapping="ascii"
37+
extbanformat="any">
3738
3839
# Disable 'NOTICE #chan :*** foo invited bar into the channel-
3940
<security announceinvites="none">

irctest/server_tests/whois.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@ def testWhoisUser(self, server):
221221
)
222222

223223
@cases.mark_specifications("RFC2812")
224-
@cases.xfailIfSoftware(["Sable"], "https://github.com/Libera-Chat/sable/issues/101")
225224
def testWhoisMissingUser(self):
226225
"""Test WHOIS on a nonexistent nickname."""
227226
self.connectClient("qux", name="qux")

0 commit comments

Comments
 (0)