implementing #1747

3 files changed, 19 insertions, 0 deletions

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 7e594e46e..88102e112 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -9,6 +9,11 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+dist_pkgcfg_DATA = \
+  testing.conf
+
 if HAVE_EXPENSIVE_TESTS
   EXPENSIVE_TESTS = \
    test_testing_topology_stability \
diff --git a/src/testing/test_testing_defaults.conf b/src/testing/test_testing_defaults.conf
index 5195882b4..c4810c303 100644
--- a/src/testing/test_testing_defaults.conf
+++ b/src/testing/test_testing_defaults.conf
@@ -58,3 +58,6 @@ AUTOSTART = NO
 
 [fs]
 AUTOSTART = NO
+
+[dv]
+AUTOSTART = NO
diff --git a/src/testing/testing.conf b/src/testing/testing.conf
new file mode 100644
index 000000000..1604ebc3a
--- /dev/null
+++ b/src/testing/testing.conf
@@ -0,0 +1,11 @@
+[TESTING]
+# How long before failing a connection?
+CONNECT_TIMEOUT = 30
+# How many connect attempts should we make?
+CONNECT_ATTEMPTS = 3
+# How many connections can happen simultaneously?
+MAX_OUTSTANDING_CONNECTIONS = 50
+
+# Should we clean up the files on peer group shutdown?
+DELETE_FILES = YES
+