forked from ansible/ansible
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[stable-2.16] Fix subversion integration test (ansible#82029)
- Remove dependency on the htpasswd module (and thus passlib) - Fix setup/teardown of the httpd process - Fix cleanup of temporary directories. (cherry picked from commit 09d9434) Co-authored-by: Matt Clay <matt@mystile.com>
- Loading branch information
Showing
5 changed files
with
17 additions
and
285 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,3 @@ | ||
setup/always/setup_passlib | ||
shippable/posix/group2 | ||
skip/macos | ||
destructive | ||
|
14 changes: 12 additions & 2 deletions
14
test/integration/targets/subversion/roles/subversion/tasks/cleanup.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.