cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Reenable git tests (#25341)

Browse source 
* Revert "Temporarily disable failing git test."
* Use correct hash for depth=1 test
This commit is contained in:
Robin Roth 2017-06-05 06:10:22 +02:00 committed by Matt Clay
parent dab1b1fe5b
commit 8f7c8ef3a5
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/integration/targets/git/tasks/main.yml
View file

@ -22,7 +22,7 @@
- include: formats.yml - include: formats.yml
- include: missing_hostkey.yml - include: missing_hostkey.yml
- include: no-destination.yml - include: no-destination.yml
#- include: specific-revision.yml - include: specific-revision.yml
- include: submodules.yml - include: submodules.yml
- include: change-repo-url.yml - include: change-repo-url.yml
- include: depth.yml - include: depth.yml

14
test/integration/targets/git/tasks/specific-revision.yml
View file

@ -50,7 +50,7 @@
git: git:
repo: "{{ repo_dir }}/format1" repo: "{{ repo_dir }}/format1"
dest: "{{ checkout_dir }}" dest: "{{ checkout_dir }}"
version: 2cfde3668b8bb10fbe2b9d5cec486025ad8cc51b version: 5473e343e33255f2da0b160f53135c56921d875c
ignore_errors: true ignore_errors: true
register: git_result register: git_result
@ -64,7 +64,7 @@
git: git:
repo: https://github.com/ansible/ansible-examples.git repo: https://github.com/ansible/ansible-examples.git
dest: '{{ checkout_dir }}' dest: '{{ checkout_dir }}'
version: 2cfde3668b8bb10fbe2b9d5cec486025ad8cc51b version: 5473e343e33255f2da0b160f53135c56921d875c
refspec: refs/pull/7/merge refspec: refs/pull/7/merge
- name: check HEAD after update with refspec - name: check HEAD after update with refspec
@ -75,7 +75,7 @@
- assert: - assert:
that: that:
- 'git_result.stdout == "2cfde3668b8bb10fbe2b9d5cec486025ad8cc51b"' - 'git_result.stdout == "5473e343e33255f2da0b160f53135c56921d875c"'
# try out combination of refspec and depth # try out combination of refspec and depth
- name: clear checkout_dir - name: clear checkout_dir
@ -87,7 +87,7 @@
git: git:
repo: https://github.com/ansible/ansible-examples.git repo: https://github.com/ansible/ansible-examples.git
dest: '{{ checkout_dir }}' dest: '{{ checkout_dir }}'
version: 2cfde3668b8bb10fbe2b9d5cec486025ad8cc51b version: 5473e343e33255f2da0b160f53135c56921d875c
refspec: refs/pull/7/merge refspec: refs/pull/7/merge
depth: 1 depth: 1
@ -99,7 +99,7 @@
- assert: - assert:
that: that:
- 'git_result.stdout == "2cfde3668b8bb10fbe2b9d5cec486025ad8cc51b"' - 'git_result.stdout == "5473e343e33255f2da0b160f53135c56921d875c"'
- name: try to access other commit - name: try to access other commit
shell: git checkout 0ce1096 shell: git checkout 0ce1096
@ -124,7 +124,7 @@
git: git:
repo: https://github.com/ansible/ansible-examples.git repo: https://github.com/ansible/ansible-examples.git
dest: '{{ checkout_dir }}' dest: '{{ checkout_dir }}'
version: 2cfde3668b8bb10fbe2b9d5cec486025ad8cc51b version: 5473e343e33255f2da0b160f53135c56921d875c
refspec: refs/pull/7/merge refspec: refs/pull/7/merge
- name: check HEAD after update with refspec - name: check HEAD after update with refspec
@ -135,7 +135,7 @@
- assert: - assert:
that: that:
- 'git_result.stdout == "2cfde3668b8bb10fbe2b9d5cec486025ad8cc51b"' - 'git_result.stdout == "5473e343e33255f2da0b160f53135c56921d875c"'
# Test that a forced shallow checkout referincing branch only always fetches latest head # Test that a forced shallow checkout referincing branch only always fetches latest head