fix tests

This commit is contained in:
Lee Goolsbee
2020-08-26 16:34:48 -05:00
parent 45c2d01b17
commit 529df0cafd
6 changed files with 20 additions and 9 deletions

View File

@@ -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') }}"

View File

@@ -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):

View File

@@ -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)

View File

@@ -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