Fix oragono tests broken by 9b2a6a063c.

irctest/controllers/oragono.py

@@ -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

irctest/server_tests/test_confusables.py

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

irctest/server_tests/test_lusers.py

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

irctest/server_tests/test_register_verify.py

@@ -3,11 +3,13 @@ from irctest import cases
 REGISTER_CAP_NAME = 'draft/register'
 
 class TestRegisterBeforeConnect(cases.BaseServerTestCase):
-
+    @staticmethod
-    def customizedConfig(self):
+    def config():
-        config = self.controller.baseConfig()
+        return {
-        config['accounts']['registration']['allow-before-connect'] = True
+            "oragono_config": lambda config: config['accounts']['registration'].update(
-        return config
+                {'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):
-
+    @staticmethod
-    def customizedConfig(self):
+    def config():
-        config = self.controller.baseConfig()
+        return {
-        config['accounts']['registration']['allow-before-connect'] = False
+            "oragono_config": lambda config: config['accounts']['registration'].update(
-        return config
+                {'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):
+    @staticmethod
-        config = self.controller.baseConfig()
+    def config():
-        config['accounts']['registration']['email-verification'] = {
+        return {
-            'enabled': True,
+            "oragono_config": lambda config: config['accounts']['registration'].update(
-            'sender': 'test@example.com',
+                {
-            'require-tls': True,
+                    'email-verification': {
-            'helo-domain': 'example.com',
+                        '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):
-
+    @staticmethod
-    def customizedConfig(self):
+    def config():
-        config = self.controller.baseConfig()
+        return {
-        config['accounts']['registration']['allow-before-connect'] = True
+            "oragono_config": lambda config: config['accounts']['registration'].update(
-        return config
+                {'allow-before-connect': True}
+            )
+        }
 
     @cases.SpecificationSelector.requiredBySpecification('Oragono')
     def testBeforeConnect(self):