From 2ae983a0b7fc2c12cffa9244dfe8f0db262bd039 Mon Sep 17 00:00:00 2001 From: Adam Brokes Date: Thu, 16 Jun 2022 16:20:46 +1000 Subject: [PATCH 1/6] CLIP-1510: Update the the c3p0 database properties to hikari --- config/confluence.cfg.xml.j2 | 22 +++++++++----- tests/test_image.py | 58 ++++++++++++++++++++++++++---------- 2 files changed, 56 insertions(+), 24 deletions(-) diff --git a/config/confluence.cfg.xml.j2 b/config/confluence.cfg.xml.j2 index 8f31e32..c624ff8 100644 --- a/config/confluence.cfg.xml.j2 +++ b/config/confluence.cfg.xml.j2 @@ -10,6 +10,12 @@ database-type-standard ${localHome}/temp ${confluenceHome}/attachments + + {% if confluence_version.split(".")[1] | int() <= 13 %} + {% set db_pool_variable = "c3p0" %} + {% else %} + {% set db_pool_variable = "hikari" %} + {% endif %} {{ atl_lucene_index_dir | default('${confluenceHome}/index') }} @@ -30,14 +36,14 @@ {{ databases[atl_db_type][0] }} com.atlassian.confluence.impl.hibernate.dialect.{{ databases[atl_db_type][1] }} - {{ atl_db_poolminsize | default('20') }} - {{ atl_db_poolmaxsize | default('100') }} - {{ atl_db_timeout | default('30') }} - {{ atl_db_idletestperiod | default('100') }} - {{ atl_db_maxstatements | default('0') }} - {{ atl_db_validate | default('false') }} - {{ atl_db_acquireincrement | default('1') }} - {{ atl_db_validationquery | default('select 1') }} + {{ atl_db_poolminsize | default('20') }} + {{ atl_db_poolmaxsize | default('100') }} + {{ atl_db_timeout | default('30') }} + {{ atl_db_idletestperiod | default('100') }} + {{ atl_db_maxstatements | default('0') }} + {{ atl_db_validate | default('true') }} + {{ atl_db_acquireincrement | default('1') }} + {{ atl_db_validationquery | default('select 1') }} {% endif %} {% if atl_cluster_type is defined %} diff --git a/tests/test_image.py b/tests/test_image.py index 9d86f67..03a4ea2 100644 --- a/tests/test_image.py +++ b/tests/test_image.py @@ -279,14 +279,14 @@ def test_confluence_xml_postgres(docker_cli, image, run_user): assert xml.findall('.//property[@name="hibernate.dialect"]')[0].text == "com.atlassian.confluence.impl.hibernate.dialect.PostgreSQLDialect" assert xml.findall('.//property[@name="hibernate.connection.driver_class"]')[0].text == "org.postgresql.Driver" - assert xml.findall('.//property[@name="hibernate.c3p0.min_size"]')[0].text == "20" - assert xml.findall('.//property[@name="hibernate.c3p0.max_size"]')[0].text == "100" - assert xml.findall('.//property[@name="hibernate.c3p0.timeout"]')[0].text == "30" - assert xml.findall('.//property[@name="hibernate.c3p0.idle_test_period"]')[0].text == "100" - assert xml.findall('.//property[@name="hibernate.c3p0.max_statements"]')[0].text == "0" - assert xml.findall('.//property[@name="hibernate.c3p0.validate"]')[0].text == "false" - assert xml.findall('.//property[@name="hibernate.c3p0.acquire_increment"]')[0].text == "1" - assert xml.findall('.//property[@name="hibernate.c3p0.preferredTestQuery"]')[0].text == "select 1" + assert xml.findall('.//property[@name="hibernate.hikari.min_size"]')[0].text == "20" + assert xml.findall('.//property[@name="hibernate.hikari.max_size"]')[0].text == "100" + assert xml.findall('.//property[@name="hibernate.hikari.timeout"]')[0].text == "30" + assert xml.findall('.//property[@name="hibernate.hikari.idle_test_period"]')[0].text == "100" + assert xml.findall('.//property[@name="hibernate.hikari.max_statements"]')[0].text == "0" + assert xml.findall('.//property[@name="hibernate.hikari.validate"]')[0].text == "true" + assert xml.findall('.//property[@name="hibernate.hikari.acquire_increment"]')[0].text == "1" + assert xml.findall('.//property[@name="hibernate.hikari.preferredTestQuery"]')[0].text == "select 1" def test_confluence_xml_postgres_all_set(docker_cli, image, run_user): @@ -310,14 +310,14 @@ def test_confluence_xml_postgres_all_set(docker_cli, image, run_user): xml = parse_xml(container, f'{get_app_home(container)}/confluence.cfg.xml') assert xml.findall('.//property[@name="hibernate.connection.driver_class"]')[0].text == "org.postgresql.Driver" assert xml.findall('.//property[@name="hibernate.dialect"]')[0].text == "com.atlassian.confluence.impl.hibernate.dialect.PostgreSQLDialect" - assert xml.findall('.//property[@name="hibernate.c3p0.min_size"]')[0].text == "x20" - assert xml.findall('.//property[@name="hibernate.c3p0.max_size"]')[0].text == "x100" - assert xml.findall('.//property[@name="hibernate.c3p0.timeout"]')[0].text == "x30" - assert xml.findall('.//property[@name="hibernate.c3p0.idle_test_period"]')[0].text == "x100" - assert xml.findall('.//property[@name="hibernate.c3p0.max_statements"]')[0].text == "x0" - assert xml.findall('.//property[@name="hibernate.c3p0.validate"]')[0].text == "xfalse" - assert xml.findall('.//property[@name="hibernate.c3p0.acquire_increment"]')[0].text == "x1" - assert xml.findall('.//property[@name="hibernate.c3p0.preferredTestQuery"]')[0].text == "xselect 1" + assert xml.findall('.//property[@name="hibernate.hikari.min_size"]')[0].text == "x20" + assert xml.findall('.//property[@name="hibernate.hikari.max_size"]')[0].text == "x100" + assert xml.findall('.//property[@name="hibernate.hikari.timeout"]')[0].text == "x30" + assert xml.findall('.//property[@name="hibernate.hikari.idle_test_period"]')[0].text == "x100" + assert xml.findall('.//property[@name="hibernate.hikari.max_statements"]')[0].text == "x0" + assert xml.findall('.//property[@name="hibernate.hikari.validate"]')[0].text == "xfalse" + assert xml.findall('.//property[@name="hibernate.hikari.acquire_increment"]')[0].text == "x1" + assert xml.findall('.//property[@name="hibernate.hikari.preferredTestQuery"]')[0].text == "xselect 1" def test_confluence_xml_cluster_aws(docker_cli, image, run_user): @@ -496,3 +496,29 @@ def test_confluence_xml_force_overwrite(docker_cli, image, run_user): xml = parse_xml(tihost, cfg) assert xml.findall('.//property[@name="confluence.webapp.context.path"]')[0].text == "/myconf" + + +def test_confluence_db_pool_version_7_13(docker_cli, image, run_user): + environment = { + 'CONFLUENCE_VERSION': '7.13.7', + 'ATL_JDBC_URL': 'postgresql:hostname', + 'ATL_DB_TYPE': 'postgresql' + } + container = run_image(docker_cli, image, user=run_user, environment=environment) + + xml = parse_xml(container, f'{get_app_home(container)}/confluence.cfg.xml') + + assert xml.findall('.//property[@name="hibernate.c3p0.min_size"]')[0].text == "20" + + +def test_confluence_db_pool_version_7_14(docker_cli, image, run_user): + environment = { + 'CONFLUENCE_VERSION': '7.17.7', + 'ATL_JDBC_URL': 'postgresql:hostname', + 'ATL_DB_TYPE': 'postgresql' + } + container = run_image(docker_cli, image, user=run_user, environment=environment) + + xml = parse_xml(container, f'{get_app_home(container)}/confluence.cfg.xml') + + assert xml.findall('.//property[@name="hibernate.hikari.min_size"]')[0].text == "20" From 1f4f33360a3ead2d5ef2890ec8ee027078252b8c Mon Sep 17 00:00:00 2001 From: Adam Brokes Date: Wed, 6 Jul 2022 15:04:51 +1000 Subject: [PATCH 2/6] CLIP-1510: Handle 6.x and 8.x+ versions --- config/confluence.cfg.xml.j2 | 7 ++++--- tests/test_image.py | 22 +++++----------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/config/confluence.cfg.xml.j2 b/config/confluence.cfg.xml.j2 index c624ff8..f744c7c 100644 --- a/config/confluence.cfg.xml.j2 +++ b/config/confluence.cfg.xml.j2 @@ -11,10 +11,11 @@ ${localHome}/temp ${confluenceHome}/attachments - {% if confluence_version.split(".")[1] | int() <= 13 %} - {% set db_pool_variable = "c3p0" %} + + {% if (confluence_version.split(".")[0] | int() == 7 and confluence_version.split(".")[1] | int() <= 13) or confluence_version.split(".")[0] | int() < 7 %} + {% set db_pool_variable = "c3p0" %} {% else %} - {% set db_pool_variable = "hikari" %} + {% set db_pool_variable = "hikari" %} {% endif %} {{ atl_lucene_index_dir | default('${confluenceHome}/index') }} diff --git a/tests/test_image.py b/tests/test_image.py index 03a4ea2..e243ab7 100644 --- a/tests/test_image.py +++ b/tests/test_image.py @@ -498,27 +498,15 @@ def test_confluence_xml_force_overwrite(docker_cli, image, run_user): assert xml.findall('.//property[@name="confluence.webapp.context.path"]')[0].text == "/myconf" -def test_confluence_db_pool_version_7_13(docker_cli, image, run_user): +@pytest.mark.parametrize("version,db_property", [('7.13.7', 'c3p0'), ('7.17.7', 'hikari'), ('6.9.0', 'c3p0'), ('8.0.0', 'hikari')]) +def test_confluence_db_pool_property(docker_cli, image, version, db_property): environment = { - 'CONFLUENCE_VERSION': '7.13.7', + 'CONFLUENCE_VERSION': version, 'ATL_JDBC_URL': 'postgresql:hostname', 'ATL_DB_TYPE': 'postgresql' } - container = run_image(docker_cli, image, user=run_user, environment=environment) + container = run_image(docker_cli, image, environment=environment) xml = parse_xml(container, f'{get_app_home(container)}/confluence.cfg.xml') - assert xml.findall('.//property[@name="hibernate.c3p0.min_size"]')[0].text == "20" - - -def test_confluence_db_pool_version_7_14(docker_cli, image, run_user): - environment = { - 'CONFLUENCE_VERSION': '7.17.7', - 'ATL_JDBC_URL': 'postgresql:hostname', - 'ATL_DB_TYPE': 'postgresql' - } - container = run_image(docker_cli, image, user=run_user, environment=environment) - - xml = parse_xml(container, f'{get_app_home(container)}/confluence.cfg.xml') - - assert xml.findall('.//property[@name="hibernate.hikari.min_size"]')[0].text == "20" + assert xml.findall(f'.//property[@name="hibernate.{db_property}.min_size"]')[0].text == "20" From 1070b8fac4107eed85bf323d7cf1e6270a79ad04 Mon Sep 17 00:00:00 2001 From: Adam Brokes Date: Wed, 6 Jul 2022 15:08:25 +1000 Subject: [PATCH 3/6] CLIP-1510: Add comment --- config/confluence.cfg.xml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/confluence.cfg.xml.j2 b/config/confluence.cfg.xml.j2 index f744c7c..ea1338d 100644 --- a/config/confluence.cfg.xml.j2 +++ b/config/confluence.cfg.xml.j2 @@ -11,7 +11,7 @@ ${localHome}/temp ${confluenceHome}/attachments - + {# Confluence versions 7.13 and newer #} {% if (confluence_version.split(".")[0] | int() == 7 and confluence_version.split(".")[1] | int() <= 13) or confluence_version.split(".")[0] | int() < 7 %} {% set db_pool_variable = "c3p0" %} {% else %} From ca5050cf028803790a37bce5ca834fabc85e79f4 Mon Sep 17 00:00:00 2001 From: Adam Brokes Date: Fri, 29 Jul 2022 09:42:50 +1000 Subject: [PATCH 4/6] CLIP-1510: Update hikari properties --- config/confluence.cfg.xml.j2 | 32 +++++++++++++++++--------------- tests/test_image.py | 20 +++++++++++++++++++- 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/config/confluence.cfg.xml.j2 b/config/confluence.cfg.xml.j2 index ea1338d..4a24a4d 100644 --- a/config/confluence.cfg.xml.j2 +++ b/config/confluence.cfg.xml.j2 @@ -11,13 +11,6 @@ ${localHome}/temp ${confluenceHome}/attachments - {# Confluence versions 7.13 and newer #} - {% if (confluence_version.split(".")[0] | int() == 7 and confluence_version.split(".")[1] | int() <= 13) or confluence_version.split(".")[0] | int() < 7 %} - {% set db_pool_variable = "c3p0" %} - {% else %} - {% set db_pool_variable = "hikari" %} - {% endif %} - {{ atl_lucene_index_dir | default('${confluenceHome}/index') }} {# We need mappings for "oracle12c" and "oracle" to remain backwards compatible with Confluence 7.3.0 and earlier. Oracle 19c support was added in Confluence 7.3.1 and changed the database type name for oracle databases from "oracle12c" to "oracle" #} @@ -37,14 +30,23 @@ {{ databases[atl_db_type][0] }} com.atlassian.confluence.impl.hibernate.dialect.{{ databases[atl_db_type][1] }} - {{ atl_db_poolminsize | default('20') }} - {{ atl_db_poolmaxsize | default('100') }} - {{ atl_db_timeout | default('30') }} - {{ atl_db_idletestperiod | default('100') }} - {{ atl_db_maxstatements | default('0') }} - {{ atl_db_validate | default('true') }} - {{ atl_db_acquireincrement | default('1') }} - {{ atl_db_validationquery | default('select 1') }} + {# Confluence versions 7.13 and newer #} + {% if (confluence_version.split(".")[0] | int() == 7 and confluence_version.split(".")[1] | int() <= 13) or confluence_version.split(".")[0] | int() < 7 %} + {{ atl_db_poolminsize | default('20') }} + {{ atl_db_poolmaxsize | default('100') }} + {{ atl_db_timeout | default('30') }} + {{ atl_db_idletestperiod | default('100') }} + {{ atl_db_maxstatements | default('0') }} + {{ atl_db_validate | default('true') }} + {{ atl_db_acquireincrement | default('1') }} + {{ atl_db_validationquery | default('select 1') }} + {% else %} + {{ (atl_db_timeout | default(30)) * 1000 }} + {{ atl_db_poolmaxsize | default('100') }} + {{ atl_db_poolminsize | default('20') }} + true + {% endif %} + {% endif %} {% if atl_cluster_type is defined %} diff --git a/tests/test_image.py b/tests/test_image.py index e243ab7..17ac0b7 100644 --- a/tests/test_image.py +++ b/tests/test_image.py @@ -498,6 +498,20 @@ def test_confluence_xml_force_overwrite(docker_cli, image, run_user): assert xml.findall('.//property[@name="confluence.webapp.context.path"]')[0].text == "/myconf" +expected_db_properties = { + 'hikari': { + 'hibernate.hikari.idleTimeout': '30000', + 'hibernate.hikari.registerMbeans': 'true', + 'hibernate.hikari.maximumPoolSize': '100', + 'hibernate.hikari.minimumIdle': '20', + }, + 'c3p0': { + 'hibernate.c3p0.min_size': '20', + 'hibernate.c3p0.max_size': '100', + 'hibernate.c3p0.timeout': '30', + } +} + @pytest.mark.parametrize("version,db_property", [('7.13.7', 'c3p0'), ('7.17.7', 'hikari'), ('6.9.0', 'c3p0'), ('8.0.0', 'hikari')]) def test_confluence_db_pool_property(docker_cli, image, version, db_property): environment = { @@ -509,4 +523,8 @@ def test_confluence_db_pool_property(docker_cli, image, version, db_property): xml = parse_xml(container, f'{get_app_home(container)}/confluence.cfg.xml') - assert xml.findall(f'.//property[@name="hibernate.{db_property}.min_size"]')[0].text == "20" + expected = expected_db_properties[db_property] + + for property, expected_value in expected.items(): + assert xml.findall(f'.//property[@name="{property}"]')[0].text == expected_value + From f5142391905895dde5a59a4c6a00549f120a366a Mon Sep 17 00:00:00 2001 From: Adam Brokes Date: Mon, 1 Aug 2022 22:28:09 +1000 Subject: [PATCH 5/6] CLIP-1510: Fix the tests --- config/confluence.cfg.xml.j2 | 2 +- tests/test_image.py | 85 ++++++++++++++++++++++++++++-------- 2 files changed, 67 insertions(+), 20 deletions(-) diff --git a/config/confluence.cfg.xml.j2 b/config/confluence.cfg.xml.j2 index 4a24a4d..5bfc5cb 100644 --- a/config/confluence.cfg.xml.j2 +++ b/config/confluence.cfg.xml.j2 @@ -41,7 +41,7 @@ {{ atl_db_acquireincrement | default('1') }} {{ atl_db_validationquery | default('select 1') }} {% else %} - {{ (atl_db_timeout | default(30)) * 1000 }} + {{ (atl_db_timeout | default(30) | int) * 1000 }} {{ atl_db_poolmaxsize | default('100') }} {{ atl_db_poolminsize | default('20') }} true diff --git a/tests/test_image.py b/tests/test_image.py index 17ac0b7..6b3e032 100644 --- a/tests/test_image.py +++ b/tests/test_image.py @@ -242,7 +242,7 @@ def test_conf_init_set(docker_cli, image): assert init.contains("confluence.home = /tmp/") -def test_confluence_xml_default(docker_cli, image): +def test_confluence_xml_default_c3p0(docker_cli, image): container = run_image(docker_cli, image) _jvm = wait_for_proc(container, get_bootstrap_proc(container)) @@ -260,13 +260,12 @@ def test_confluence_lucene_index(docker_cli, image): xml = parse_xml(container, f'{get_app_home(container)}/confluence.cfg.xml') assert xml.findall('.//property[@name="lucene.index.dir"]')[0].text == '/some/other/dir' - def test_confluence_xml_postgres(docker_cli, image, run_user): environment = { 'ATL_DB_TYPE': 'postgresql', 'ATL_JDBC_URL': 'atl_jdbc_url', 'ATL_JDBC_USER': 'atl_jdbc_user', - 'ATL_JDBC_PASSWORD': 'atl_jdbc_password' + 'ATL_JDBC_PASSWORD': 'atl_jdbc_password', } container = run_image(docker_cli, image, user=run_user, environment=environment) _jvm = wait_for_proc(container, get_bootstrap_proc(container)) @@ -279,18 +278,66 @@ def test_confluence_xml_postgres(docker_cli, image, run_user): assert xml.findall('.//property[@name="hibernate.dialect"]')[0].text == "com.atlassian.confluence.impl.hibernate.dialect.PostgreSQLDialect" assert xml.findall('.//property[@name="hibernate.connection.driver_class"]')[0].text == "org.postgresql.Driver" - assert xml.findall('.//property[@name="hibernate.hikari.min_size"]')[0].text == "20" - assert xml.findall('.//property[@name="hibernate.hikari.max_size"]')[0].text == "100" - assert xml.findall('.//property[@name="hibernate.hikari.timeout"]')[0].text == "30" - assert xml.findall('.//property[@name="hibernate.hikari.idle_test_period"]')[0].text == "100" - assert xml.findall('.//property[@name="hibernate.hikari.max_statements"]')[0].text == "0" - assert xml.findall('.//property[@name="hibernate.hikari.validate"]')[0].text == "true" - assert xml.findall('.//property[@name="hibernate.hikari.acquire_increment"]')[0].text == "1" - assert xml.findall('.//property[@name="hibernate.hikari.preferredTestQuery"]')[0].text == "select 1" + assert xml.findall('.//property[@name="hibernate.hikari.idleTimeout"]')[0].text == "30000" + assert xml.findall('.//property[@name="hibernate.hikari.maximumPoolSize"]')[0].text == "100" + assert xml.findall('.//property[@name="hibernate.hikari.minimumIdle"]')[0].text == "20" + assert xml.findall('.//property[@name="hibernate.hikari.registerMbeans"]')[0].text == "true" def test_confluence_xml_postgres_all_set(docker_cli, image, run_user): environment = { + 'ATL_DB_TYPE': 'postgresql', + 'ATL_JDBC_URL': 'atl_jdbc_url', + 'ATL_JDBC_USER': 'atl_jdbc_user', + 'ATL_JDBC_PASSWORD': 'atl_jdbc_password', + 'ATL_DB_POOLMAXSIZE': 'x100', + 'ATL_DB_POOLMINSIZE': 'x20', + 'ATL_DB_TIMEOUT': '40', + } + container = run_image(docker_cli, image, user=run_user, environment=environment) + _jvm = wait_for_proc(container, get_bootstrap_proc(container)) + + xml = parse_xml(container, f'{get_app_home(container)}/confluence.cfg.xml') + assert xml.findall('.//property[@name="hibernate.connection.driver_class"]')[0].text == "org.postgresql.Driver" + assert xml.findall('.//property[@name="hibernate.dialect"]')[0].text == "com.atlassian.confluence.impl.hibernate.dialect.PostgreSQLDialect" + assert xml.findall('.//property[@name="hibernate.hikari.idleTimeout"]')[0].text == "40000" + assert xml.findall('.//property[@name="hibernate.hikari.maximumPoolSize"]')[0].text == "x100" + assert xml.findall('.//property[@name="hibernate.hikari.minimumIdle"]')[0].text == "x20" + + + +def test_confluence_xml_postgres_c3p0(docker_cli, image, run_user): + environment = { + 'CONFLUENCE_VERSION': '7.10.0', + 'ATL_DB_TYPE': 'postgresql', + 'ATL_JDBC_URL': 'atl_jdbc_url', + 'ATL_JDBC_USER': 'atl_jdbc_user', + 'ATL_JDBC_PASSWORD': 'atl_jdbc_password', + } + container = run_image(docker_cli, image, user=run_user, environment=environment) + _jvm = wait_for_proc(container, get_bootstrap_proc(container)) + + xml = parse_xml(container, f'{get_app_home(container)}/confluence.cfg.xml') + assert xml.findall('.//property[@name="hibernate.connection.url"]')[0].text == "atl_jdbc_url" + assert xml.findall('.//property[@name="hibernate.connection.username"]')[0].text == "atl_jdbc_user" + assert xml.findall('.//property[@name="hibernate.connection.password"]')[0].text == "atl_jdbc_password" + assert xml.findall('.//property[@name="confluence.database.choice"]')[0].text == "postgresql" + assert xml.findall('.//property[@name="hibernate.dialect"]')[0].text == "com.atlassian.confluence.impl.hibernate.dialect.PostgreSQLDialect" + assert xml.findall('.//property[@name="hibernate.connection.driver_class"]')[0].text == "org.postgresql.Driver" + + assert xml.findall('.//property[@name="hibernate.c3p0.min_size"]')[0].text == "20" + assert xml.findall('.//property[@name="hibernate.c3p0.max_size"]')[0].text == "100" + assert xml.findall('.//property[@name="hibernate.c3p0.timeout"]')[0].text == "30" + assert xml.findall('.//property[@name="hibernate.c3p0.idle_test_period"]')[0].text == "100" + assert xml.findall('.//property[@name="hibernate.c3p0.max_statements"]')[0].text == "0" + assert xml.findall('.//property[@name="hibernate.c3p0.validate"]')[0].text == "true" + assert xml.findall('.//property[@name="hibernate.c3p0.acquire_increment"]')[0].text == "1" + assert xml.findall('.//property[@name="hibernate.c3p0.preferredTestQuery"]')[0].text == "select 1" + + +def test_confluence_xml_postgres_all_set_c3p0(docker_cli, image, run_user): + environment = { + 'CONFLUENCE_VERSION': '7.10.0', 'ATL_DB_TYPE': 'postgresql', 'ATL_JDBC_URL': 'atl_jdbc_url', 'ATL_JDBC_USER': 'atl_jdbc_user', @@ -310,14 +357,14 @@ def test_confluence_xml_postgres_all_set(docker_cli, image, run_user): xml = parse_xml(container, f'{get_app_home(container)}/confluence.cfg.xml') assert xml.findall('.//property[@name="hibernate.connection.driver_class"]')[0].text == "org.postgresql.Driver" assert xml.findall('.//property[@name="hibernate.dialect"]')[0].text == "com.atlassian.confluence.impl.hibernate.dialect.PostgreSQLDialect" - assert xml.findall('.//property[@name="hibernate.hikari.min_size"]')[0].text == "x20" - assert xml.findall('.//property[@name="hibernate.hikari.max_size"]')[0].text == "x100" - assert xml.findall('.//property[@name="hibernate.hikari.timeout"]')[0].text == "x30" - assert xml.findall('.//property[@name="hibernate.hikari.idle_test_period"]')[0].text == "x100" - assert xml.findall('.//property[@name="hibernate.hikari.max_statements"]')[0].text == "x0" - assert xml.findall('.//property[@name="hibernate.hikari.validate"]')[0].text == "xfalse" - assert xml.findall('.//property[@name="hibernate.hikari.acquire_increment"]')[0].text == "x1" - assert xml.findall('.//property[@name="hibernate.hikari.preferredTestQuery"]')[0].text == "xselect 1" + assert xml.findall('.//property[@name="hibernate.c3p0.min_size"]')[0].text == "x20" + assert xml.findall('.//property[@name="hibernate.c3p0.max_size"]')[0].text == "x100" + assert xml.findall('.//property[@name="hibernate.c3p0.timeout"]')[0].text == "x30" + assert xml.findall('.//property[@name="hibernate.c3p0.idle_test_period"]')[0].text == "x100" + assert xml.findall('.//property[@name="hibernate.c3p0.max_statements"]')[0].text == "x0" + assert xml.findall('.//property[@name="hibernate.c3p0.validate"]')[0].text == "xfalse" + assert xml.findall('.//property[@name="hibernate.c3p0.acquire_increment"]')[0].text == "x1" + assert xml.findall('.//property[@name="hibernate.c3p0.preferredTestQuery"]')[0].text == "xselect 1" def test_confluence_xml_cluster_aws(docker_cli, image, run_user): From 380ac76e13d5921d7fe52ff4b1a13d2e6d766352 Mon Sep 17 00:00:00 2001 From: Adam Brokes Date: Tue, 2 Aug 2022 10:20:27 +1000 Subject: [PATCH 6/6] CLIP-1510: Remove empty line --- config/confluence.cfg.xml.j2 | 1 - 1 file changed, 1 deletion(-) diff --git a/config/confluence.cfg.xml.j2 b/config/confluence.cfg.xml.j2 index 5bfc5cb..0a5861f 100644 --- a/config/confluence.cfg.xml.j2 +++ b/config/confluence.cfg.xml.j2 @@ -10,7 +10,6 @@ database-type-standard ${localHome}/temp ${confluenceHome}/attachments - {{ atl_lucene_index_dir | default('${confluenceHome}/index') }} {# We need mappings for "oracle12c" and "oracle" to remain backwards compatible with Confluence 7.3.0 and earlier. Oracle 19c support was added in Confluence 7.3.1 and changed the database type name for oracle databases from "oracle12c" to "oracle" #}