val
/
irctest
mirror of https://github.com/progval/irctest.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix oragono tests broken by 9b2a6a063c.

This commit is contained in:
Valentin Lorentz 2021-02-17 22:43:37 +01:00 committed by Valentin Lorentz
parent 8d427c80c8
commit fe0d65f7c8
4 changed files with 58 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
irctest/controllers/oragono.py
View File

@ -178,6 +178,9 @@ class OragonoController(BaseServerController, DirectoryBasedController):
'enabled': True,
}
if 'oragono_config' in self.test_config:
self.test_config['oragono_config'](config)
self.port = port
bind_address = "127.0.0.1:%s" % (port,)
listener_conf = None # plaintext

13
irctest/server_tests/test_confusables.py
View File

@ -2,14 +2,13 @@ from irctest import cases
from irctest.numerics import RPL_WELCOME, ERR_NICKNAMEINUSE
class ConfusablesTestCase(cases.BaseServerTestCase):
def customizedConfig(self):
config = self.controller.baseConfig()
config['accounts']['nick-reservation'] = {
'enabled': True,
'method': 'strict',
@staticmethod
def config():
return {
"oragono_config": lambda config: config['accounts'].update(
{'nick-reservation': {'enabled': True, 'method': 'strict'}}
)
}
return config
@cases.SpecificationSelector.requiredBySpecification('Oragono')
def testConfusableNicks(self):

24
irctest/server_tests/test_lusers.py
View File

@ -185,11 +185,13 @@ class LusersUnregisteredTestCase(LusersTestCase):
class LusersUnregisteredDefaultInvisibleTest(LusersUnregisteredTestCase):
"""Same as above but with +i as the default."""
def customizedConfig(self):
conf = self.controller.baseConfig()
conf['accounts']['default-user-modes'] = '+i'
return conf
@staticmethod
def config():
return {
"oragono_config": lambda config: config['accounts'].update(
{'default-user-modes': '+i'}
)
}
@cases.SpecificationSelector.requiredBySpecification('Oragono')
def testLusers(self):
@ -276,11 +278,13 @@ class LuserOpersTest(LusersTestCase):
class OragonoInvisibleDefaultTest(LusersTestCase):
def customizedConfig(self):
conf = self.controller.baseConfig()
conf['accounts']['default-user-modes'] = '+i'
return conf
@staticmethod
def config():
return {
"oragono_config": lambda config: config['accounts'].update(
{'default-user-modes': '+i'}
)
}
@cases.SpecificationSelector.requiredBySpecification('Oragono')
def testLusers(self):

50
irctest/server_tests/test_register_verify.py
View File

@ -3,11 +3,13 @@ from irctest import cases
REGISTER_CAP_NAME = 'draft/register'
class TestRegisterBeforeConnect(cases.BaseServerTestCase):
def customizedConfig(self):
config = self.controller.baseConfig()
config['accounts']['registration']['allow-before-connect'] = True
return config
@staticmethod
def config():
return {
"oragono_config": lambda config: config['accounts']['registration'].update(
{'allow-before-connect': True}
)
}
@cases.SpecificationSelector.requiredBySpecification('Oragono')
def testBeforeConnect(self):
@ -23,11 +25,13 @@ class TestRegisterBeforeConnect(cases.BaseServerTestCase):
self.assertEqual(register_response.params[0], 'SUCCESS')
class TestRegisterBeforeConnectDisallowed(cases.BaseServerTestCase):
def customizedConfig(self):
config = self.controller.baseConfig()
config['accounts']['registration']['allow-before-connect'] = False
return config
@staticmethod
def config():
return {
"oragono_config": lambda config: config['accounts']['registration'].update(
{'allow-before-connect': False}
)
}
@cases.SpecificationSelector.requiredBySpecification('Oragono')
def testBeforeConnect(self):
@ -43,15 +47,21 @@ class TestRegisterBeforeConnectDisallowed(cases.BaseServerTestCase):
self.assertEqual(fail_response.params[:2], ['REGISTER', 'DISALLOWED'])
class TestRegisterEmailVerified(cases.BaseServerTestCase):
def customizedConfig(self):
config = self.controller.baseConfig()
config['accounts']['registration']['email-verification'] = {
@staticmethod
def config():
return {
"oragono_config": lambda config: config['accounts']['registration'].update(
{
'email-verification': {
'enabled': True,
'sender': 'test@example.com',
'require-tls': True,
'helo-domain': 'example.com',
},
'allow-before-connect': True,
}
)
}
config['accounts']['registration']['allow-before-connect'] = True
return config
@cases.SpecificationSelector.requiredBySpecification('Oragono')
@ -76,11 +86,13 @@ class TestRegisterEmailVerified(cases.BaseServerTestCase):
self.assertEqual(fail_response.params[:2], ['REGISTER', 'INVALID_EMAIL'])
class TestRegisterNoLandGrabs(cases.BaseServerTestCase):
def customizedConfig(self):
config = self.controller.baseConfig()
config['accounts']['registration']['allow-before-connect'] = True
return config
@staticmethod
def config():
return {
"oragono_config": lambda config: config['accounts']['registration'].update(
{'allow-before-connect': True}
)
}
@cases.SpecificationSelector.requiredBySpecification('Oragono')
def testBeforeConnect(self):