Bump UnrealIRCd and ngIRCd (#285)

This commit is contained in:
2024-07-27 18:14:57 +02:00
committed by GitHub
parent 75d9040d37
commit e3485b92b4
3 changed files with 26 additions and 14 deletions

View File

@ -228,7 +228,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
path: ngircd path: ngircd
ref: 3e3f6cbeceefd9357b53b27c2386bb39306ab353 ref: acf8409c60ccc96beed0a1f990c4f9374823c0ce
repository: ngircd/ngircd repository: ngircd/ngircd
- name: Build ngircd - name: Build ngircd
run: | run: |
@ -351,7 +351,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
path: unrealircd path: unrealircd
ref: da3c1c654481a33035b9c703957e1c25d0158259 ref: a68625454078641ce984eeb197f7e02b1857ab6c
repository: unrealircd/unrealircd repository: unrealircd/unrealircd
- name: Build UnrealIRCd 6 - name: Build UnrealIRCd 6
run: | run: |

View File

@ -71,22 +71,34 @@ class ChannelOperatorModeTestCase(cases.BaseServerTestCase):
self.assertLessEqual(commands, {ERR_NOSUCHNICK, ERR_USERNOTINCHANNEL}) self.assertLessEqual(commands, {ERR_NOSUCHNICK, ERR_USERNOTINCHANNEL})
@cases.mark_specifications("Modern") @cases.mark_specifications("Modern")
@cases.xfailIf(
lambda self: bool(
self.controller.software_name == "UnrealIRCd"
and self.controller.software_version == 5
),
"UnrealIRCd <6.1.7 returns ERR_NOSUCHNICK on non-existent channel",
)
def testChannelOperatorModeChannelDoesNotExist(self): def testChannelOperatorModeChannelDoesNotExist(self):
"""Test that +o targeting a nonexistent channel fails as expected.""" """Test that +o targeting a nonexistent channel fails as expected.
"If <target> is a channel that does not exist on the network,
# the ERR_NOSUCHCHANNEL (403) numeric is returned."
"""
self.setupNicks() self.setupNicks()
# target channel does not exist, but target nick does: # target channel does not exist, but target nick does:
self.sendLine("chanop", "MODE #nonexistentchan +o chanop") self.sendLine("chanop", "MODE #nonexistentchan +o chanop")
messages = self.getMessages("chanop") messages = self.getMessages("chanop")
self.assertEqual(len(messages), 1) self.assertEqual(len(messages), 1)
# Modern: "If <target> is a channel that does not exist on the network, self.assertMessageMatch(messages[0], command=ERR_NOSUCHCHANNEL)
# the ERR_NOSUCHCHANNEL (403) numeric is returned."
# However, Unreal and ngircd send 401 ERR_NOSUCHNICK here instead:
if self.controller.software_name not in ("UnrealIRCd", "ngIRCd"):
self.assertEqual(messages[0].command, ERR_NOSUCHCHANNEL)
else:
self.assertIn(messages[0].command, [ERR_NOSUCHCHANNEL, ERR_NOSUCHNICK])
@cases.mark_specifications("Modern") @cases.mark_specifications("Modern")
@cases.xfailIf(
lambda self: bool(
self.controller.software_name == "UnrealIRCd"
and self.controller.software_version == 5
),
"UnrealIRCd <6.1.7 returns ERR_NOSUCHNICK on non-existent channel",
)
def testChannelOperatorModeChannelAndTargetDoNotExist(self): def testChannelOperatorModeChannelAndTargetDoNotExist(self):
"""Test that +o targeting a nonexistent channel and nickname """Test that +o targeting a nonexistent channel and nickname
fails as expected.""" fails as expected."""
@ -97,7 +109,7 @@ class ChannelOperatorModeTestCase(cases.BaseServerTestCase):
self.assertEqual(len(messages), 1) self.assertEqual(len(messages), 1)
self.assertIn( self.assertIn(
messages[0].command, messages[0].command,
[ERR_NOSUCHCHANNEL, ERR_NOTONCHANNEL, ERR_NOSUCHNICK, ERR_USERNOTINCHANNEL], [ERR_NOSUCHCHANNEL, ERR_NOTONCHANNEL, ERR_USERNOTINCHANNEL],
) )
@cases.mark_specifications("Modern") @cases.mark_specifications("Modern")

View File

@ -230,7 +230,7 @@ software:
name: ngircd name: ngircd
repository: ngircd/ngircd repository: ngircd/ngircd
refs: refs:
stable: 3e3f6cbeceefd9357b53b27c2386bb39306ab353 # three years ahead of rel-26.1 stable: acf8409c60ccc96beed0a1f990c4f9374823c0ce # three months ahead of v27
release: null release: null
devel: master devel: master
devel_release: null devel_release: null
@ -300,8 +300,8 @@ software:
name: UnrealIRCd 6 name: UnrealIRCd 6
repository: unrealircd/unrealircd repository: unrealircd/unrealircd
refs: refs:
stable: da3c1c654481a33035b9c703957e1c25d0158259 # 6.0.7 stable: a68625454078641ce984eeb197f7e02b1857ab6c # 6.1.7.1
release: da3c1c654481a33035b9c703957e1c25d0158259 # 6.0.7 release: a68625454078641ce984eeb197f7e02b1857ab6c # 6.1.7.1
devel: unreal60_dev devel: unreal60_dev
devel_release: null devel_release: null
path: unrealircd path: unrealircd