From: Alan T. DeKok Date: Sun, 13 Jul 2025 12:04:03 +0000 (-0400) Subject: regularize pool configuration for tests X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e740fa437ba2f8003b2332f28f653df8474685c8;p=thirdparty%2Ffreeradius-server.git 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 68a1f06bfe6..5d42150dda3 100644 --- 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 2b3451c6f80..cc7db6e18f0 100644 --- 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 2b527efc9dd..8110b7af28f 100644 --- 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 e25300d76a5..0968d33ce33 100644 --- 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 22a83b34b12..ca2959b18bc 100644 --- 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 }