dovecot-2.2-pigeonhole: testsuite: Allow setting configuration o...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.2-pigeonhole/rev/a146b20160f6
changeset: 2128:a146b20160f6
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Mon Nov 02 18:56:39 2015 +0100
description:
testsuite: Allow setting configuration options from command line.
These will influence some of the performed tests.

diffstat:

 src/testsuite/testsuite-mailstore.c |   2 ++
 src/testsuite/testsuite-settings.c  |  17 +++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r 62fb7272c675 -r a146b20160f6 src/testsuite/testsuite-mailstore.c
--- a/src/testsuite/testsuite-mailstore.c	Mon Nov 02 18:56:39 2015 +0100
+++ b/src/testsuite/testsuite-mailstore.c	Mon Nov 02 18:56:39 2015 +0100
@@ -125,6 +125,8 @@
 
 struct mail_user *testsuite_mailstore_get_user(void)
 {
+	if (testsuite_mailstore_user == NULL)
+		return sieve_tool_get_mail_user(sieve_tool);
 	return testsuite_mailstore_user;
 }
 
diff -r 62fb7272c675 -r a146b20160f6 src/testsuite/testsuite-settings.c
--- a/src/testsuite/testsuite-settings.c	Mon Nov 02 18:56:39 2015 +0100
+++ b/src/testsuite/testsuite-settings.c	Mon Nov 02 18:56:39 2015 +0100
@@ -5,10 +5,12 @@
 #include "hash.h"
 #include "imem.h"
 #include "strfuncs.h"
+#include "mail-user.h"
 
 #include "sieve-common.h"
 
 #include "testsuite-common.h"
+#include "testsuite-mailstore.h"
 #include "testsuite-settings.h"
 
 struct testsuite_setting {
@@ -49,14 +51,17 @@
 static const char *testsuite_setting_get
 (void *context ATTR_UNUSED, const char *identifier)
 {
-	struct testsuite_setting *setting =
-		hash_table_lookup(settings, identifier);
+	struct testsuite_setting *setting;
+	struct mail_user *user;
 
-	if ( setting == NULL ) {
+	setting = hash_table_lookup(settings, identifier);
+	if ( setting != NULL )
+		return setting->value;
+
+	user = testsuite_mailstore_get_user();
+	if ( user == NULL )
 		return NULL;
-	}
-
-	return setting->value;
+	return mail_user_plugin_getenv(user, identifier);
 }
 
 void testsuite_setting_set(const char *identifier, const char *value)