Skip to content

Commit

Permalink
Reenable git tests (ansible#25341)
Browse files Browse the repository at this point in the history
* Revert "Temporarily disable failing git test."
* Use correct hash for depth=1 test
  • Loading branch information
robinro authored and mattclay committed Jun 5, 2017
1 parent dab1b1f commit 8f7c8ef
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion test/integration/targets/git/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
- include: formats.yml
- include: missing_hostkey.yml
- include: no-destination.yml
#- include: specific-revision.yml
- include: specific-revision.yml
- include: submodules.yml
- include: change-repo-url.yml
- include: depth.yml
Expand Down
14 changes: 7 additions & 7 deletions test/integration/targets/git/tasks/specific-revision.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
git:
repo: "{{ repo_dir }}/format1"
dest: "{{ checkout_dir }}"
version: 2cfde3668b8bb10fbe2b9d5cec486025ad8cc51b
version: 5473e343e33255f2da0b160f53135c56921d875c
ignore_errors: true
register: git_result

Expand All @@ -64,7 +64,7 @@
git:
repo: https://github.com/ansible/ansible-examples.git
dest: '{{ checkout_dir }}'
version: 2cfde3668b8bb10fbe2b9d5cec486025ad8cc51b
version: 5473e343e33255f2da0b160f53135c56921d875c
refspec: refs/pull/7/merge

- name: check HEAD after update with refspec
Expand All @@ -75,7 +75,7 @@

- assert:
that:
- 'git_result.stdout == "2cfde3668b8bb10fbe2b9d5cec486025ad8cc51b"'
- 'git_result.stdout == "5473e343e33255f2da0b160f53135c56921d875c"'

# try out combination of refspec and depth
- name: clear checkout_dir
Expand All @@ -87,7 +87,7 @@
git:
repo: https://github.com/ansible/ansible-examples.git
dest: '{{ checkout_dir }}'
version: 2cfde3668b8bb10fbe2b9d5cec486025ad8cc51b
version: 5473e343e33255f2da0b160f53135c56921d875c
refspec: refs/pull/7/merge
depth: 1

Expand All @@ -99,7 +99,7 @@

- assert:
that:
- 'git_result.stdout == "2cfde3668b8bb10fbe2b9d5cec486025ad8cc51b"'
- 'git_result.stdout == "5473e343e33255f2da0b160f53135c56921d875c"'

- name: try to access other commit
shell: git checkout 0ce1096
Expand All @@ -124,7 +124,7 @@
git:
repo: https://github.com/ansible/ansible-examples.git
dest: '{{ checkout_dir }}'
version: 2cfde3668b8bb10fbe2b9d5cec486025ad8cc51b
version: 5473e343e33255f2da0b160f53135c56921d875c
refspec: refs/pull/7/merge

- name: check HEAD after update with refspec
Expand All @@ -135,7 +135,7 @@

- assert:
that:
- 'git_result.stdout == "2cfde3668b8bb10fbe2b9d5cec486025ad8cc51b"'
- 'git_result.stdout == "5473e343e33255f2da0b160f53135c56921d875c"'

# Test that a forced shallow checkout referincing branch only always fetches latest head

Expand Down

0 comments on commit 8f7c8ef

Please sign in to comment.