val/irctest
1
0
Fork 0
mirror of https://github.com/progval/irctest.git synced 2025-04-06 23:39:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

lusers: Fix tests to allow missing optional args

Browse Source 
According to https://defs.ircdocs.horse/defs/numerics.html , they are not mandatory;
and InspIRCd doesn't return them.
This commit is contained in:
Valentin Lorentz
2021-02-24 13:31:31 +01:00
committed by Valentin Lorentz
parent f92b0e2889
commit 2a1324fc94
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
irctest/server_tests/test_lusers.py
View File

@ -1,5 +1,6 @@
from dataclasses import dataclass from dataclasses import dataclass
import re import re
from typing import Optional
from irctest import cases from irctest import cases
from irctest.numerics import ( from irctest.numerics import (
@ -26,19 +27,19 @@ class LusersResult:
GlobalInvisible: int = None GlobalInvisible: int = None
Servers: int = None Servers: int = None
Opers: int = None Opers: int = None
Unregistered: int = None Unregistered: Optional[int] = None
Channels: int = None Channels: int = None
LocalTotal: int = None LocalTotal: Optional[int] = None
LocalMax: int = None LocalMax: Optional[int] = None
GlobalTotal: int = None GlobalTotal: Optional[int] = None
GlobalMax: int = None GlobalMax: Optional[int] = None
class LusersTestCase(cases.BaseServerTestCase): class LusersTestCase(cases.BaseServerTestCase):
def assertLusersResult(self, lusers, unregistered, total, max_): def assertLusersResult(self, lusers, unregistered, total, max_):
self.assertIn(lusers.Unregistered, (unregistered, None)) self.assertIn(lusers.Unregistered, (unregistered, None))
self.assertEqual(lusers.GlobalTotal, total) self.assertIn(lusers.GlobalTotal, (total, None))
self.assertEqual(lusers.GlobalMax, max_) self.assertIn(lusers.GlobalMax, (max_, None))
self.assertGreaterEqual(lusers.GlobalInvisible, 0) self.assertGreaterEqual(lusers.GlobalInvisible, 0)
self.assertGreaterEqual(lusers.GlobalVisible, 0) self.assertGreaterEqual(lusers.GlobalVisible, 0)
@ -46,8 +47,8 @@ class LusersTestCase(cases.BaseServerTestCase):
self.assertLessEqual(lusers.GlobalVisible, total) self.assertLessEqual(lusers.GlobalVisible, total)
self.assertEqual(lusers.GlobalInvisible + lusers.GlobalVisible, total) self.assertEqual(lusers.GlobalInvisible + lusers.GlobalVisible, total)
self.assertEqual(lusers.LocalTotal, total) self.assertIn(lusers.LocalTotal, (total, None))
self.assertEqual(lusers.LocalMax, max_) self.assertIn(lusers.LocalMax, (max_, None))
def getLusers(self, client): def getLusers(self, client):
self.sendLine(client, "LUSERS") self.sendLine(client, "LUSERS")
@ -77,12 +78,20 @@ class LusersTestCase(cases.BaseServerTestCase):
result.Unregistered = int(by_numeric[RPL_LUSERUNKNOWN].params[1]) result.Unregistered = int(by_numeric[RPL_LUSERUNKNOWN].params[1])
if RPL_LUSERCHANNELS in by_numeric: if RPL_LUSERCHANNELS in by_numeric:
result.Channels = int(by_numeric[RPL_LUSERCHANNELS].params[1]) result.Channels = int(by_numeric[RPL_LUSERCHANNELS].params[1])
localusers = by_numeric[RPL_LOCALUSERS] localusers = by_numeric[RPL_LOCALUSERS]
globalusers = by_numeric[RPL_GLOBALUSERS]
if len(localusers.params) == 4:
result.LocalTotal = int(localusers.params[1]) result.LocalTotal = int(localusers.params[1])
result.LocalMax = int(localusers.params[2]) result.LocalMax = int(localusers.params[2])
globalusers = by_numeric[RPL_GLOBALUSERS]
result.GlobalTotal = int(globalusers.params[1]) result.GlobalTotal = int(globalusers.params[1])
result.GlobalMax = int(globalusers.params[2]) result.GlobalMax = int(globalusers.params[2])
else:
# Arguments 1 and 2 are optional
self.assertEqual(len(localusers.params), 2)
result.LocalTotal = result.LocalMax = None
result.GlobalTotal = result.GlobalMax = None
return result
luserme = by_numeric[RPL_LUSERME] luserme = by_numeric[RPL_LUSERME]
self.assertEqual(len(luserme.params), 2) self.assertEqual(len(luserme.params), 2)