pull the mysql password from an env variable

irctest/controllers/oragono.py

@@ -209,6 +209,32 @@ class OragonoController(BaseServerController, DirectoryBasedController):
         config.update(LOGGING_CONFIG)
         return config
 
+    def addMysqlToConfig(self):
+        mysql_password = os.getenv('MYSQL_PASSWORD')
+        if not mysql_password:
+            return None
+        config = self.baseConfig()
+        config['datastore']['mysql'] = {
+           "enabled": True,
+           "host": "localhost",
+           "user": "oragono",
+           "password": mysql_password,
+           "history-database": "oragono_history",
+           "timeout": "3s",
+        }
+        config['accounts']['multiclient'] = {
+            'enabled': True,
+            'allowed-by-default': True,
+            'always-on': 'disabled',
+        }
+        config['history']['persistent'] = {
+            "enabled": True,
+            "unregistered-channels": True,
+            "registered-channels": "opt-out",
+            "direct-messages": "opt-out",
+        }
+        return config
+
     def rehash(self, case, config):
         self._config = config
         self._write_config()

irctest/server_tests/test_chathistory.py

@@ -112,31 +112,7 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
         self.validate_chathistory(echo_messages, 1, chname)
 
     def customizedConfig(self):
-        if MYSQL_PASSWORD == "":
+        return self.controller.addMysqlToConfig()
-            return None
-
-        # enable mysql-backed history for all channels and logged-in clients
-        config = self.controller.baseConfig()
-        config['datastore']['mysql'] = {
-           "enabled": True,
-           "host": "localhost",
-           "user": "oragono",
-           "password": MYSQL_PASSWORD,
-           "history-database": "oragono_history",
-           "timeout": "3s",
-        }
-        config['accounts']['multiclient'] = {
-            'enabled': True,
-            'allowed-by-default': True,
-            'always-on': 'disabled',
-        }
-        config['history']['persistent'] = {
-            "enabled": True,
-            "unregistered-channels": True,
-            "registered-channels": "opt-out",
-            "direct-messages": "opt-out",
-        }
-        return config
 
     @cases.SpecificationSelector.requiredBySpecification('Oragono')
     def testChathistoryDMs(self):

irctest/server_tests/test_znc_playback.py

@@ -7,6 +7,9 @@ from irctest.irc_utils.random import random_name
 
 class ZncPlaybackTestCase(cases.BaseServerTestCase):
 
+    def customizedConfig(self):
+        return self.controller.addMysqlToConfig()
+
     @cases.SpecificationSelector.requiredBySpecification('Oragono')
     def testZncPlayback(self):
         chname = random_name('#znc_channel')