Skip to content

Commit e3485b9

Browse files
authored
Bump UnrealIRCd and ngIRCd (#285)
1 parent 75d9040 commit e3485b9

File tree

3 files changed

+26
-14
lines changed

3 files changed

+26
-14
lines changed

.github/workflows/test-stable.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ jobs:
228228
uses: actions/checkout@v4
229229
with:
230230
path: ngircd
231-
ref: 3e3f6cbeceefd9357b53b27c2386bb39306ab353
231+
ref: acf8409c60ccc96beed0a1f990c4f9374823c0ce
232232
repository: ngircd/ngircd
233233
- name: Build ngircd
234234
run: |
@@ -351,7 +351,7 @@ jobs:
351351
uses: actions/checkout@v4
352352
with:
353353
path: unrealircd
354-
ref: da3c1c654481a33035b9c703957e1c25d0158259
354+
ref: a68625454078641ce984eeb197f7e02b1857ab6c
355355
repository: unrealircd/unrealircd
356356
- name: Build UnrealIRCd 6
357357
run: |

irctest/server_tests/chmodes/operator.py

+21-9
Original file line numberDiff line numberDiff line change
@@ -71,22 +71,34 @@ def testChannelOperatorModeTargetDoesNotExist(self):
7171
self.assertLessEqual(commands, {ERR_NOSUCHNICK, ERR_USERNOTINCHANNEL})
7272

7373
@cases.mark_specifications("Modern")
74+
@cases.xfailIf(
75+
lambda self: bool(
76+
self.controller.software_name == "UnrealIRCd"
77+
and self.controller.software_version == 5
78+
),
79+
"UnrealIRCd <6.1.7 returns ERR_NOSUCHNICK on non-existent channel",
80+
)
7481
def testChannelOperatorModeChannelDoesNotExist(self):
75-
"""Test that +o targeting a nonexistent channel fails as expected."""
82+
"""Test that +o targeting a nonexistent channel fails as expected.
83+
84+
"If <target> is a channel that does not exist on the network,
85+
# the ERR_NOSUCHCHANNEL (403) numeric is returned."
86+
"""
7687
self.setupNicks()
7788
# target channel does not exist, but target nick does:
7889
self.sendLine("chanop", "MODE #nonexistentchan +o chanop")
7990
messages = self.getMessages("chanop")
8091
self.assertEqual(len(messages), 1)
81-
# Modern: "If <target> is a channel that does not exist on the network,
82-
# the ERR_NOSUCHCHANNEL (403) numeric is returned."
83-
# However, Unreal and ngircd send 401 ERR_NOSUCHNICK here instead:
84-
if self.controller.software_name not in ("UnrealIRCd", "ngIRCd"):
85-
self.assertEqual(messages[0].command, ERR_NOSUCHCHANNEL)
86-
else:
87-
self.assertIn(messages[0].command, [ERR_NOSUCHCHANNEL, ERR_NOSUCHNICK])
92+
self.assertMessageMatch(messages[0], command=ERR_NOSUCHCHANNEL)
8893

8994
@cases.mark_specifications("Modern")
95+
@cases.xfailIf(
96+
lambda self: bool(
97+
self.controller.software_name == "UnrealIRCd"
98+
and self.controller.software_version == 5
99+
),
100+
"UnrealIRCd <6.1.7 returns ERR_NOSUCHNICK on non-existent channel",
101+
)
90102
def testChannelOperatorModeChannelAndTargetDoNotExist(self):
91103
"""Test that +o targeting a nonexistent channel and nickname
92104
fails as expected."""
@@ -97,7 +109,7 @@ def testChannelOperatorModeChannelAndTargetDoNotExist(self):
97109
self.assertEqual(len(messages), 1)
98110
self.assertIn(
99111
messages[0].command,
100-
[ERR_NOSUCHCHANNEL, ERR_NOTONCHANNEL, ERR_NOSUCHNICK, ERR_USERNOTINCHANNEL],
112+
[ERR_NOSUCHCHANNEL, ERR_NOTONCHANNEL, ERR_USERNOTINCHANNEL],
101113
)
102114

103115
@cases.mark_specifications("Modern")

workflows.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ software:
230230
name: ngircd
231231
repository: ngircd/ngircd
232232
refs:
233-
stable: 3e3f6cbeceefd9357b53b27c2386bb39306ab353 # three years ahead of rel-26.1
233+
stable: acf8409c60ccc96beed0a1f990c4f9374823c0ce # three months ahead of v27
234234
release: null
235235
devel: master
236236
devel_release: null
@@ -300,8 +300,8 @@ software:
300300
name: UnrealIRCd 6
301301
repository: unrealircd/unrealircd
302302
refs:
303-
stable: da3c1c654481a33035b9c703957e1c25d0158259 # 6.0.7
304-
release: da3c1c654481a33035b9c703957e1c25d0158259 # 6.0.7
303+
stable: a68625454078641ce984eeb197f7e02b1857ab6c # 6.1.7.1
304+
release: a68625454078641ce984eeb197f7e02b1857ab6c # 6.1.7.1
305305
devel: unreal60_dev
306306
devel_release: null
307307
path: unrealircd

0 commit comments

Comments
 (0)