Configure synapse to use the test mail server (#705)

Tweak the generated synapse config so that it uses the test mail server.

Author: richvdh

lib/SyTest/Homeserver.pm

@@ -64,6 +64,23 @@ validate recaptcha submissions.
 
 =back
 
+=head2 smtp_server_config => HASH
+
+Details of an smtp server for things like 3pid validation. Should include the
+following keys:
+
+=over
+
+=item C<host>
+
+The hostname where the SMTP server can be reached.
+
+=item C<port>
+
+The port where the SMTP server can be reached.
+
+=back
+
 =head2 cas_config => HASH
 
 Parameters for testing the server's CAS integration. Should include the
@@ -149,7 +166,7 @@ sub configure
    my %params = @_;
 
    exists $params{$_} and $self->{$_} = delete $params{$_} for qw(
-      recaptcha_config cas_config
+      recaptcha_config cas_config smtp_server_config
       app_service_config_files
    );
 

lib/SyTest/Homeserver/Synapse.pm

@@ -142,6 +142,7 @@ sub start
 
    my $listeners = [ $self->generate_listeners ];
    my $bind_host = $self->{bind_host};
+   my $unsecure_port = $self->{ports}{synapse_unsecure};
 
    my $macaroon_secret_key = "secret_$port";
    my $registration_shared_secret = "reg_secret";
@@ -161,6 +162,7 @@ sub start
    my $config_path = $self->{paths}{config} = $self->write_yaml_file( "config.yaml" => {
         server_name => $self->server_name,
         log_config => $log_config_file,
+        public_baseurl => "http://${bind_host}:$unsecure_port",
 
         # We configure synapse to use a TLS cert which is signed by our dummy CA...
         tls_certificate_path => $self->{paths}{cert_file},
@@ -255,6 +257,14 @@ sub start
            recaptcha_private_key    => $self->{recaptcha_config}->{private_key},
         ) : (),
 
+        $self->{smtp_server_config} ? (
+           email => {
+              smtp_host => $self->{smtp_server_config}->{host},
+              smtp_port => $self->{smtp_server_config}->{port},
+              notif_from => 'synapse@localhost',
+           },
+        ) : (),
+
         map {
            defined $self->{$_} ? ( $_ => $self->{$_} ) : ()
         } qw(

tests/05homeserver.pl

@@ -58,6 +58,10 @@
             "https://$api_host:" . $server->secure_port :
             "http://$api_host:" . $server->unsecure_port;
 
+         $server->configure(
+            smtp_server_config => $mail_server_info,
+         );
+
          $server->configure(
             # Config for testing recaptcha. 90jira/SYT-8.pl
             recaptcha_config => {