Mirrored_Repos/docker-atlassian-confluence-server
1
0
Fork 0
mirror of https://bitbucket.org/atlassian-docker/docker-atlassian-confluence-server.git synced 2024-08-30 18:22:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

DCD-1299: Unnecessary test removed. server.xml.j2 default value updated to testing case

Browse Source
This commit is contained in:
Jun 2021-07-07 14:27:07 +10:00
parent 025c2ae2b1
commit add4566663
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/server.xml.j2
View File

@ -13,11 +13,11 @@
<Service name="Catalina"> <Service name="Catalina">
<Connector port="{{ atl_tomcat_port | default('8090') }}" <Connector port="{{ atl_tomcat_port | default('8090') }}"
maxThreads="{{ atl_tomcat_maxthreads | default('100') }}" maxThreads="{{ atl_tomcat_maxthreads | default('48') }}"
minSpareThreads="{{ atl_tomcat_minsparethreads | default('10') }}" minSpareThreads="{{ atl_tomcat_minsparethreads | default('10') }}"
connectionTimeout="{{ atl_tomcat_connectiontimeout | default('20000') }}" connectionTimeout="{{ atl_tomcat_connectiontimeout | default('20000') }}"
enableLookups="{{ atl_tomcat_enablelookups | default('false') }}" enableLookups="{{ atl_tomcat_enablelookups | default('false') }}"
protocol="{{ atl_tomcat_protocol | default('HTTP/1.1') }}" protocol="{{ atl_tomcat_protocol | default('org.apache.coyote.http11.Http11NioProtocol') }}"
redirectPort="{{ atl_tomcat_redirectport | default('8443') }}" redirectPort="{{ atl_tomcat_redirectport | default('8443') }}"
acceptCount="{{ atl_tomcat_acceptcount | default('10') }}" acceptCount="{{ atl_tomcat_acceptcount | default('10') }}"
secure="{{ atl_tomcat_secure | default(catalina_connector_secure) | default('false') }}" secure="{{ atl_tomcat_secure | default(catalina_connector_secure) | default('false') }}"

11
tests/test_image.py
View File

@ -70,15 +70,16 @@ def test_server_xml_defaults(docker_cli, image):
assert connector.get('connectionTimeout') == '20000' assert connector.get('connectionTimeout') == '20000'
assert connector.get('enableLookups') == 'false' assert connector.get('enableLookups') == 'false'
assert connector.get('protocol') == 'org.apache.coyote.http11.Http11NioProtocol' assert connector.get('protocol') == 'org.apache.coyote.http11.Http11NioProtocol'
assert connector.get('redirectPort') == '8443'
assert connector.get('acceptCount') == '10' assert connector.get('acceptCount') == '10'
assert connector.get('URIEncoding') == 'UTF-8'
assert connector.get('debug') == '0'
assert connector.get('secure') == 'false' assert connector.get('secure') == 'false'
assert connector.get('scheme') == 'http' assert connector.get('scheme') == 'http'
assert connector.get('proxyName') == '' assert connector.get('proxyName') == ''
assert connector.get('proxyPort') == '' assert connector.get('proxyPort') == ''
assert connector.get('maxHttpHeaderSize') == '8192' assert connector.get('maxHttpHeaderSize') == '8192'
assert context.get('path') == ''
def test_server_xml_catalina_fallback(docker_cli, image): def test_server_xml_catalina_fallback(docker_cli, image):
environment = { environment = {
'CATALINA_CONNECTOR_PROXYNAME': 'PROXYNAME', 'CATALINA_CONNECTOR_PROXYNAME': 'PROXYNAME',
@ -110,6 +111,7 @@ def test_server_xml_params(docker_cli, image):
'ATL_TOMCAT_CONNECTIONTIMEOUT': '20001', 'ATL_TOMCAT_CONNECTIONTIMEOUT': '20001',
'ATL_TOMCAT_ENABLELOOKUPS': 'true', 'ATL_TOMCAT_ENABLELOOKUPS': 'true',
'ATL_TOMCAT_PROTOCOL': 'HTTP/2', 'ATL_TOMCAT_PROTOCOL': 'HTTP/2',
'ATL_TOMCAT_REDIRECTPORT': '8444',
'ATL_TOMCAT_ACCEPTCOUNT': '11', 'ATL_TOMCAT_ACCEPTCOUNT': '11',
'ATL_TOMCAT_SECURE': 'true', 'ATL_TOMCAT_SECURE': 'true',
'ATL_TOMCAT_SCHEME': 'https', 'ATL_TOMCAT_SCHEME': 'https',
@ -117,8 +119,6 @@ def test_server_xml_params(docker_cli, image):
'ATL_PROXY_PORT': '443', 'ATL_PROXY_PORT': '443',
'ATL_TOMCAT_MAXHTTPHEADERSIZE': '8193', 'ATL_TOMCAT_MAXHTTPHEADERSIZE': '8193',
'ATL_TOMCAT_CONTEXTPATH': '/myconf', 'ATL_TOMCAT_CONTEXTPATH': '/myconf',
'ATL_TOMCAT_URI_ENCODING': 'ISO-8859-1',
'ATL_TOMCAT_DEBUG':'1',
} }
container = run_image(docker_cli, image, environment=environment) container = run_image(docker_cli, image, environment=environment)
_jvm = wait_for_proc(container, get_bootstrap_proc(container)) _jvm = wait_for_proc(container, get_bootstrap_proc(container))
@ -135,14 +135,13 @@ def test_server_xml_params(docker_cli, image):
assert connector.get('connectionTimeout') == environment.get('ATL_TOMCAT_CONNECTIONTIMEOUT') assert connector.get('connectionTimeout') == environment.get('ATL_TOMCAT_CONNECTIONTIMEOUT')
assert connector.get('enableLookups') == environment.get('ATL_TOMCAT_ENABLELOOKUPS') assert connector.get('enableLookups') == environment.get('ATL_TOMCAT_ENABLELOOKUPS')
assert connector.get('protocol') == environment.get('ATL_TOMCAT_PROTOCOL') assert connector.get('protocol') == environment.get('ATL_TOMCAT_PROTOCOL')
assert connector.get('redirectPort') == environment.get('ATL_TOMCAT_REDIRECTPORT')
assert connector.get('acceptCount') == environment.get('ATL_TOMCAT_ACCEPTCOUNT') assert connector.get('acceptCount') == environment.get('ATL_TOMCAT_ACCEPTCOUNT')
assert connector.get('secure') == environment.get('ATL_TOMCAT_SECURE') assert connector.get('secure') == environment.get('ATL_TOMCAT_SECURE')
assert connector.get('scheme') == environment.get('ATL_TOMCAT_SCHEME') assert connector.get('scheme') == environment.get('ATL_TOMCAT_SCHEME')
assert connector.get('proxyName') == environment.get('ATL_PROXY_NAME') assert connector.get('proxyName') == environment.get('ATL_PROXY_NAME')
assert connector.get('proxyPort') == environment.get('ATL_PROXY_PORT') assert connector.get('proxyPort') == environment.get('ATL_PROXY_PORT')
assert connector.get('maxHttpHeaderSize') == environment.get('ATL_TOMCAT_MAXHTTPHEADERSIZE') assert connector.get('maxHttpHeaderSize') == environment.get('ATL_TOMCAT_MAXHTTPHEADERSIZE')
assert connector.get('URIEncoding') == environment.get('ATL_TOMCAT_URI_ENCODING')
assert connector.get('debug') == environment.get('ATL_TOMCAT_DEBUG')
assert context.get('path') == environment.get('ATL_TOMCAT_CONTEXTPATH') assert context.get('path') == environment.get('ATL_TOMCAT_CONTEXTPATH')