Fix subversion integration test

test/integration/targets/subversion/aliases

@@ -1,4 +1,3 @@
-setup/always/setup_passlib
 shippable/posix/group2
 skip/macos
 destructive

test/integration/targets/subversion/roles/subversion/tasks/cleanup.yml

@@ -1,8 +1,18 @@
 ---
-- name: stop apache after tests
-  shell: "kill -9 $(cat '{{ subversion_server_dir }}/apache.pid')"
+- name: stop apache after tests - non Red Hat
+  shell: apachectl -k stop -f {{ subversion_server_dir }}/subversion.conf
+  when: ansible_os_family not in ['RedHat']
+
+- name: stop apache after tests - Red Hat
+  shell: "kill $(cat '{{ subversion_server_dir }}/apache.pid')"
+  when: ansible_os_family in ['RedHat']
 
 - name: remove tmp subversion server dir
   file:
     path: '{{ subversion_server_dir }}'
     state: absent
+
+- name: remove tmp subversion checkout dir
+  file:
+    path: '{{ subversion_test_dir }}'
+    state: absent

test/integration/targets/subversion/roles/subversion/tasks/setup.yml

@@ -45,11 +45,7 @@
     creates: '{{ subversion_server_dir }}/{{ subversion_repo_name }}'
 
 - name: add test user to htpasswd for Subversion site
-  htpasswd:
-    path: '{{ subversion_server_dir }}/svn-auth-users'
-    name: '{{ subversion_username }}'
-    password: '{{ subversion_password }}'
-    state: present
+  command: htpasswd -bc {{ subversion_server_dir + '/svn-auth-users' | quote }} {{ subversion_username | quote }} {{ subversion_password | quote }}
 
 - name: apply ownership for all SVN directories
   file:
@@ -62,11 +58,11 @@
   command: apachectl -k start -f {{ subversion_server_dir }}/subversion.conf
   async: 3600  # We kill apache manually in the clean up phase
   poll: 0
-  when: ansible_os_family not in ['RedHat', 'Alpine']
+  when: ansible_os_family not in ['RedHat']
 
 # On Red Hat based OS', we can't use apachectl to start up own instance, just use the raw httpd
 - name: start test Apache SVN site - Red Hat
   command: httpd -k start -f {{ subversion_server_dir }}/subversion.conf
   async: 3600  # We kill apache manually in the clean up phase
   poll: 0
-  when: ansible_os_family in ['RedHat', 'Alpine']
+  when: ansible_os_family in ['RedHat']

test/integration/targets/subversion/vars/Alpine.yml

@@ -3,5 +3,7 @@ subversion_packages:
 - subversion
 - mod_dav_svn
 - apache2-webdav
+- apache2-utils
+- apache2-ctl
 apache_user: apache
 apache_group: apache