Modify check for smtp settings to be kinder to CI

synapse/config/emailconfig.py

@@ -95,22 +95,14 @@ def read_config(self, config):
             bleach
 
         if not self.email_enable_password_reset_from_is:
-            required = [
-                "smtp_host",
-                "smtp_port",
-                "notif_from",
-            ]
-
-            missing = []
-            for k in required:
-                if k not in email_config:
-                    missing.append(k)
-
-            if (len(missing) > 0):
+            if (not self.email_smtp_host
+                or not self.email_smtp_port
+                or not self.email_notif_from
+            ):
                 raise RuntimeError(
                     "email.enable_password_reset_from_is is False "
-                    "but required keys are missing: %s" %
-                    (", ".join(["email." + k for k in missing]),)
+                    "but not all of the following are set: "
+                    "email.smtp_host, email.smtp_port, email_notif_from"
                 )
 
             # Templates for password reset emails