regularize pool configuration for tests

it makes absolutely zero sense to have "uses = 2".  This means
that the connections will get closed in the middle of the unit
tests.

diff --git a/src/tests/modules/sql_mysql/module.conf b/src/tests/modules/sql_mysql/module.conf
index 68a1f06bfe63591396b804fc604f306a68af7693..5d42150dda3aef213c0e5d2ef891fdae37fb5d63 100644 (file)
--- a/src/tests/modules/sql_mysql/module.conf
+++ b/src/tests/modules/sql_mysql/module.conf
@@ -25,10 +25,9 @@ sql {
        pool {
                start = 1
                min = 0
-               max = 1
+               max = 10
                spare = 3
-               uses = 2
-               lifetime = 1
+               lifetime = 0
                idle_timeout = 60
                retry_delay = 1
        }
@@ -67,10 +66,9 @@ sql sql2 {
        pool {
                start = 0
                min = 0
-               max = 1
+               max = 10
                spare = 3
-               uses = 2
-               lifetime = 1
+               lifetime = 0
                idle_timeout = 60
                retry_delay = 1
        }

diff --git a/src/tests/modules/sql_postgresql/module.conf b/src/tests/modules/sql_postgresql/module.conf
index 2b3451c6f8072370729a6af205f8e3829a736351..cc7db6e18f0eb4ecbac033db59475c17607a4441 100644 (file)
--- a/src/tests/modules/sql_postgresql/module.conf
+++ b/src/tests/modules/sql_postgresql/module.conf
@@ -25,10 +25,9 @@ sql {
        pool {
                start = 1
                min = 0
-               max = 1
+               max = 10
                spare = 3
-               uses = 2
-               lifetime = 1
+               lifetime = 0
                idle_timeout = 60
                retry_delay = 1
        }
@@ -63,12 +62,11 @@ sql sql2 {
        read_groups = yes
 
        pool {
-               start = 0
+               start = 1
                min = 0
-               max = 1
+               max = 10
                spare = 3
-               uses = 2
-               lifetime = 1
+               lifetime = 0
                idle_timeout = 60
                retry_delay = 1
        }

diff --git a/src/tests/modules/sql_sqlite/module.conf b/src/tests/modules/sql_sqlite/module.conf
index 2b527efc9ddb1a9e72bc24505ffe23c8e0946a0f..8110b7af28fc229b94ef02f714af038e7a307ae0 100644 (file)
--- a/src/tests/modules/sql_sqlite/module.conf
+++ b/src/tests/modules/sql_sqlite/module.conf
@@ -23,11 +23,11 @@ sql {
        read_groups = yes
 
        pool {
-               start = 0
+               start = 1
                min = 0
-               max = 1
+               max = 10
                spare = 3
-               lifetime = 1
+               lifetime = 0
                idle_timeout = 60
                retry_delay = 1
        }
@@ -69,9 +69,9 @@ sql sql2 {
        pool {
                start = 1
                min = 0
-               max = 1
+               max = 10
                spare = 3
-               lifetime = 1
+               lifetime = 0
                idle_timeout = 60
                retry_delay = 1
        }

diff --git a/src/tests/modules/sqlcounter/module.conf b/src/tests/modules/sqlcounter/module.conf
index e25300d76a5ae7c3d842a1f9f79d680c4aaa7aa8..0968d33ce33230f193a54c2cc53335ec3dd6291b 100644 (file)
--- a/src/tests/modules/sqlcounter/module.conf
+++ b/src/tests/modules/sqlcounter/module.conf
@@ -20,9 +20,10 @@ sql {
        pool {
                start = 1
                min = 0
-               max = 1
-               spare = 1
-               lifetime = 1
+               max = 10
+               spare = 3
+               lifetime = 0
+               idle_timeout = 60
                retry_delay = 1
        }
 

diff --git a/src/tests/modules/sqlippool/module.conf b/src/tests/modules/sqlippool/module.conf
index 22a83b34b12b4e7a9561dd36c0cfe2d9392e546c..ca2959b18bcd74ca1c3ce701b1fed251a40f9b41 100644 (file)
--- a/src/tests/modules/sqlippool/module.conf
+++ b/src/tests/modules/sqlippool/module.conf
@@ -26,9 +26,9 @@ sql {
        pool {
                start = 1
                min = 0
-               max = 1
-               spare = 1
-               lifetime = 1
+               max = 10
+               spare = 3
+               lifetime = 0
                idle_timeout = 60
                retry_delay = 1
        }