mirror of
https://bitbucket.org/atlassian/dc-deployments-automation.git
synced 2025-12-14 00:43:06 -06:00
fix tests
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
atl_jvm_heap: "2048m"
|
||||
atl_fonts_fallback_dirs:
|
||||
- "{{ atl_java_home }}/lib/fonts/fallback/"
|
||||
- "{{ atl_java_home }}/lib/fonts/fallback/"
|
||||
|
||||
atl_autologin_cookie_age: "{{ lookup('env', 'ATL_AUTOLOGIN_COOKIE_AGE') }}"
|
||||
|
||||
|
||||
@@ -81,8 +81,7 @@ def test_confluence_config_file(host):
|
||||
assert f.contains('<property name="hibernate.c3p0.preferredTestQuery">select 1;</property>')
|
||||
|
||||
@pytest.mark.parametrize('font', [
|
||||
# '/usr/lib/jvm/java/lib/fonts/fallback/NotoSansJavanese-Regular.ttf',
|
||||
# '/usr/lib/jvm/jre/lib/fonts/fallback/NotoSansJavanese-Regular.ttf'
|
||||
# '/usr/lib/jvm/java/lib/fonts/fallback/NotoSansJavanese-Regular.ttf'
|
||||
'/opt/atlassian/confluence/current/jre/lib/fonts/fallback/NotoSansJavanese-Regular.ttf'
|
||||
])
|
||||
def test_fonts_installed_and_linked(host, font):
|
||||
|
||||
@@ -12,8 +12,7 @@ def test_seraph_file(host):
|
||||
assert f.contains('<param-value>COOKIEAGE</param-value>')
|
||||
|
||||
@pytest.mark.parametrize('font', [
|
||||
'/usr/lib/jvm/java/lib/fonts/fallback/NotoSansJavanese-Regular.ttf',
|
||||
'/usr/lib/jvm/jre/lib/fonts/fallback/NotoSansJavanese-Regular.ttf'
|
||||
'/usr/lib/jvm/java/lib/fonts/fallback/NotoSansJavanese-Regular.ttf'
|
||||
])
|
||||
def test_fonts_installed_and_linked(host, font):
|
||||
f = host.file(font)
|
||||
|
||||
@@ -52,7 +52,6 @@
|
||||
insertafter: "EOF"
|
||||
line: 'export CATALINA_OPTS="${CATALINA_OPTS} {{ atl_catalina_opts }} {{ atl_catalina_opts_extra }}"'
|
||||
|
||||
|
||||
- name: Configure login properties
|
||||
template:
|
||||
src: seraph-config.xml.j2
|
||||
|
||||
Reference in New Issue
Block a user