Factor out the description-message-building in the runners.

[mailshears.git] / test / mailshears.test.conf.yml

diff --git a/test/mailshears.test.conf.yml b/test/mailshears.test.conf.yml
index d02d89e169dab5e2d3b8869802943bf9edf6f50e..0bfbd7f19f24abb4a714c2f75ba9930290d7da4a 100644 (file)
--- a/test/mailshears.test.conf.yml
+++ b/test/mailshears.test.conf.yml
@@ -1,24 +1,5 @@
-i_mean_business: false
-
-postfixadmin_dbhost: localhost
-postfixadmin_dbport: 5432
-postfixadmin_dbopts:
-postfixadmin_dbtty:
-postfixadmin_dbuser: postgres
-postfixadmin_dbpass:
-postfixadmin_dbname: postfixadmin_test
-
-plugins: [postfixadmin, roundcube, agendav, davical]
-
-mail_root: /tmp
-
-roundcube_dbhost: localhost
-roundcube_dbport: 5432
-roundcube_dbopts:
-roundcube_dbtty:
-roundcube_dbuser: postgres
-roundcube_dbpass:
-roundcube_dbname: roundcube_test
+i_mean_business: true
+plugins: [agendav, davical, dovecot, postfixadmin, roundcube]
 
 agendav_dbhost: localhost
 agendav_dbport: 5432
@@ -35,3 +16,21 @@ davical_dbtty:
 davical_dbuser: postgres
 davical_dbpass:
 davical_dbname: davical_test
+
+dovecot_mail_root: /tmp/mailshears-test
+
+postfixadmin_dbhost: localhost
+postfixadmin_dbport: 5432
+postfixadmin_dbopts:
+postfixadmin_dbtty:
+postfixadmin_dbuser: postgres
+postfixadmin_dbpass:
+postfixadmin_dbname: postfixadmin_test
+
+roundcube_dbhost: localhost
+roundcube_dbport: 5432
+roundcube_dbopts:
+roundcube_dbtty:
+roundcube_dbuser: postgres
+roundcube_dbpass:
+roundcube_dbname: roundcube_test