@@ -943,13 +943,13 @@ def create_archive(git_path, module, dest, archive, version, repo, result):

             result.update(changed=False)

             # Cleanup before exiting

             try:

-                shutil.remove(tempdir)

+                shutil.rmtree(tempdir)

             except OSError:

                 pass

         else:

             try:

                 shutil.move(new_archive, archive)

-                shutil.remove(tempdir)

+                shutil.rmtree(tempdir)

                 result.update(changed=True)

             except OSError as e:

                 module.fail_json(msg="Failed to move %s to %s" %

@@ -1,31 +1,37 @@

-

 # test for https://github.com/ansible/ansible-modules-core/pull/3386

-- name: clone repo

+- name: AMBIGUOUS-REF | clone repo

   git:

     repo: '{{ repo_format1 }}'

     dest: '{{ checkout_dir }}'

-- name: rename remote to be ambiguous

-  command: git remote rename origin v0.1 chdir="{{ checkout_dir }}"

+- name: AMBIGUOUS-REF | rename remote to be ambiguous

+  command: git remote rename origin v0.1

+  args:

+    chdir: "{{ checkout_dir }}"

-- name: switch to HEAD

+- name: AMBIGUOUS-REF | switch to HEAD

   git:

     repo: '{{ repo_format1 }}'

     dest: '{{ checkout_dir }}'

     remote: v0.1

-- name: rev-parse remote HEAD

-  command: git rev-parse v0.1/HEAD chdir="{{ checkout_dir }}"

+- name: AMBIGUOUS-REF | rev-parse remote HEAD

+  command: git rev-parse v0.1/HEAD

+  args:

+    chdir: "{{ checkout_dir }}"

   register: git_remote_head

-- name: rev-parse local HEAD

-  command: git rev-parse HEAD chdir="{{ checkout_dir }}"

+- name: AMBIGUOUS-REF | rev-parse local HEAD

+  command: git rev-parse HEAD

+  args:

+    chdir: "{{ checkout_dir }}"

   register: git_local_head

 - assert:

     that: git_remote_head.stdout == git_local_head.stdout

-- name: clear checkout_dir

-  file: state=absent path={{ checkout_dir }}

+- name: AMBIGUOUS-REF | clear checkout_dir

+  file:

+    state: absent

+    path: "{{ checkout_dir }}"

new file mode 100644

@@ -0,0 +1,34 @@

+- name: ARCHIVE | Clear checkout_dir

+  file:

+    state: absent

+    path: "{{ checkout_dir }}"

+

+- name: ARCHIVE | Archive repo using various archival format

+  git:

+    repo: '{{ repo_format1 }}'

+    dest: '{{ checkout_dir }}'

+    archive: '{{ checkout_dir }}/test_role.{{ item }}'

+  register: git_archive

+  with_items: "{{ git_archive_extensions[ansible_os_family ~ ansible_distribution_major_version | default('default') ] | default(git_archive_extensions.default) }}"

+

+# The map filter was added in Jinja2 2.7, which is newer than the version on RHEL/CentOS 6,

+# so we skip this validation on those hosts

+- name: ARCHIVE | Assert that archives were downloaded

+  assert:

+    that: (git_archive.results | map(attribute='changed') | unique | list)[0]

+  when:

+    - "ansible_os_family == 'RedHat'"

+    - ansible_distribution_major_version | version_compare('7', '>=')

+

+- name: ARCHIVE | Check if archive file is created or not

+  stat:

+    path: '{{ checkout_dir }}/test_role.{{ item }}'

+  register: archive_check

+  with_items: "{{ git_archive_extensions[ansible_os_family ~ ansible_distribution_major_version | default('default') ] | default(git_archive_extensions.default) }}"

+

+- name: ARCHIVE | Assert that archive files exist

+  assert:

+    that: (archive_check.results | map(attribute='stat.exists') | unique | list)[0]

+  when:

+    - "ansible_os_family == 'RedHat'"

+    - ansible_distribution_major_version | version_compare('7', '>=')

@@ -1,91 +1,103 @@

-

 # test change of repo url

 # see https://github.com/ansible/ansible-modules-core/pull/721

-- name: clear checkout_dir

-  file: state=absent path={{ checkout_dir }}

+- name: CHANGE-REPO-URL | clear checkout_dir

+  file:

+    state: absent

+    path: "{{ checkout_dir }}"

-- name: Clone example git repo

+- name: CHANGE-REPO-URL | Clone example git repo

   git:

-    repo: '{{ repo_update_url_1 }}'

-    dest: '{{ checkout_dir }}'

+    repo: "{{ repo_update_url_1 }}"

+    dest: "{{ checkout_dir }}"

-- name: Clone repo with changed url to the same place

+- name: CHANGE-REPO-URL | Clone repo with changed url to the same place

   git:

-    repo: '{{ repo_update_url_2 }}'

-    dest: '{{ checkout_dir }}'

+    repo: "{{ repo_update_url_2 }}"

+    dest: "{{ checkout_dir }}"

   register: clone2

 - assert:

     that: "clone2|success"

-- name: check url updated

+- name: CHANGE-REPO-URL | check url updated

   shell: git remote show origin | grep Fetch

   register: remote_url

   args:

-    chdir: '{{ checkout_dir }}'

+    chdir: "{{ checkout_dir }}"

   environment:

     LC_ALL: C

 - assert:

-    that: 

+    that:

     - "'git-test-new' in remote_url.stdout"

     - "'git-test-old' not in remote_url.stdout"

-- name: check for new content in git-test-new

+- name: CHANGE-REPO-URL | check for new content in git-test-new

   stat: path={{ checkout_dir }}/newfilename

   register: repo_content

-- name: assert presence of new file in repo (i.e. working copy updated)

+- name: CHANGE-REPO-URL | assert presence of new file in repo (i.e. working copy updated)

   assert:

     that: "repo_content.stat.exists"

 # Make sure 'changed' result is accurate in check mode.

 # See https://github.com/ansible/ansible-modules-core/pull/4243

-- name: clear checkout_dir

-  file: state=absent path={{ checkout_dir }}

+- name: CHANGE-REPO-URL | clear checkout_dir

+  file:

+    state: absent

+    path: "{{ checkout_dir }}"

-- name: clone repo

-  git: repo={{ repo_update_url_1 }} dest={{ checkout_dir }}

+- name: CHANGE-REPO-URL | clone repo

+  git:

+    repo: "{{ repo_update_url_1 }}"

+    dest: "{{ checkout_dir }}"

-- name: clone repo with same url to same destination

-  git: repo={{ repo_update_url_1 }} dest={{ checkout_dir }}

+- name: CHANGE-REPO-URL | clone repo with same url to same destination

+  git:

+    repo: "{{ repo_update_url_1 }}"

+    dest: "{{ checkout_dir }}"

   register: checkout_same_url

-- name: check repo not changed

+- name: CHANGE-REPO-URL | check repo not changed

   assert:

     that:

       - not checkout_same_url|changed

-- name: clone repo with new url to same destination

-  git: repo={{ repo_update_url_2 }} dest={{ checkout_dir }}

+- name: CHANGE-REPO-URL | clone repo with new url to same destination

+  git:

+    repo: "{{ repo_update_url_2 }}"

+    dest: "{{ checkout_dir }}"

   register: checkout_new_url

-- name: check repo changed

+- name: CHANGE-REPO-URL | check repo changed

   assert:

     that:

       - checkout_new_url|changed

-- name: clone repo with new url in check mode

-  git: repo={{ repo_update_url_1 }} dest={{ checkout_dir }}

+- name: CHANGE-REPO-URL | clone repo with new url in check mode

+  git:

+    repo: "{{ repo_update_url_1 }}"

+    dest: "{{ checkout_dir }}"

   register: checkout_new_url_check_mode

   check_mode: True

-- name: check repo reported changed in check mode

+- name: CHANGE-REPO-URL | check repo reported changed in check mode

   assert:

     that:

-      - checkout_new_url_check_mode|changed

-  when: git_version.stdout | version_compare("{{git_version_supporting_ls_remote}}", '>=')

+      - checkout_new_url_check_mode | changed

+  when: git_version.stdout | version_compare(git_version_supporting_ls_remote, '>=')

-- name: clone repo with new url after check mode

-  git: repo={{ repo_update_url_1 }} dest={{ checkout_dir }}

+- name: CHANGE-REPO-URL | clone repo with new url after check mode

+  git:

+    repo: "{{ repo_update_url_1 }}"

+    dest: "{{ checkout_dir }}"

   register: checkout_new_url_after_check_mode

-- name: check repo still changed after check mode

+- name: CHANGE-REPO-URL | check repo still changed after check mode

   assert:

     that:

       - checkout_new_url_after_check_mode|changed

@@ -93,26 +105,28 @@

 # Test that checkout by branch works when the branch is not in our current repo but the sha is

-- name: clear checkout_dir

-  file: state=absent path={{ checkout_dir }}

+- name: CHANGE-REPO-URL | clear checkout_dir

+  file:

+    state: absent

+    path: "{{ checkout_dir }}"

-- name: "Clone example git repo that we're going to modify"

+- name: CHANGE-REPO-URL | "Clone example git repo that we're going to modify"

   git:

-    repo: '{{ repo_update_url_1 }}'

-    dest: '{{ checkout_dir }}/repo'

+    repo: "{{ repo_update_url_1 }}"

+    dest: "{{ checkout_dir }}/repo"

-- name: Clone the repo again - this is what we test

+- name: CHANGE-REPO-URL | Clone the repo again - this is what we test

   git:

-    repo: '{{ checkout_dir }}/repo'

-    dest: '{{ checkout_dir }}/checkout'

+    repo: "{{ checkout_dir }}/repo"

+    dest: "{{ checkout_dir }}/checkout"

-- name: Add a branch to the repo

+- name: CHANGE-REPO-URL | Add a branch to the repo

   command: git branch new-branch

   args:

-    chdir: '{{ checkout_dir }}/repo'

+    chdir: "{{ checkout_dir }}/repo"

-- name: Checkout the new branch in the checkout

+- name: CHANGE-REPO-URL | Checkout the new branch in the checkout

   git:

-    repo: '{{ checkout_dir}}/repo'

+    repo: "{{ checkout_dir}}/repo"

     version: 'new-branch'

-    dest: '{{ checkout_dir }}/checkout'

+    dest: "{{ checkout_dir }}/checkout"

@@ -1,5 +1,3 @@

-

 # test for  https://github.com/ansible/ansible-modules-core/issues/527

 # clone a repo, add a tag to the same commit and try to checkout the new commit

@@ -7,12 +5,12 @@

 - name: clear checkout_dir

   file:

     state: absent

-    path: '{{ checkout_dir }}'

+    path: "{{ checkout_dir }}"

 - name: checkout example repo

   git:

-    repo: '{{ repo_dir }}/format1'

-    dest: '{{ checkout_dir }}'

+    repo: "{{ repo_dir }}/format1"

+    dest: "{{ checkout_dir }}"

 - name: get tags of head

   command: git tag --contains

@@ -32,8 +30,8 @@

 - name: update copy with new tag

   git:

-    repo: '{{ repo_dir }}/format1'

-    dest: '{{checkout_dir}}'

+    repo: "{{ repo_dir }}/format1"

+    dest: "{{checkout_dir}}"

     version: newtag

   register: update_new_tag

@@ -53,4 +51,4 @@

 - name: clear checkout_dir

   file:

     state: absent

-    path: '{{ checkout_dir }}'

+    path: "{{ checkout_dir }}"

@@ -1,30 +1,30 @@

-

 # Test the depth option and fetching revisions that were ignored first

-- name: clear checkout_dir

-  file: state=absent path={{ checkout_dir }}

+- name: DEPTH | clear checkout_dir

+  file:

+    state: absent

+    path: "{{ checkout_dir }}"

-- name: Clone example git repo with depth 1

+- name: DEPTH | Clone example git repo with depth 1

   git:

     repo: 'file://{{ repo_dir|expanduser }}/shallow'

     dest: '{{ checkout_dir }}'

     depth: 1

-- name: try to access earlier commit

+- name: DEPTH | try to access earlier commit

   command: "git checkout {{git_shallow_head_1.stdout}}"

   register: checkout_early

   failed_when: False

   args:

     chdir: '{{ checkout_dir }}'

-- name: make sure the old commit was not fetched

+- name: DEPTH | make sure the old commit was not fetched

   assert:

     that: 'checkout_early.rc != 0'

-  when: git_version.stdout | version_compare("{{git_version_supporting_depth}}", '>=')

+  when: git_version.stdout | version_compare(git_version_supporting_depth, '>=')

 # tests https://github.com/ansible/ansible/issues/14954

-- name: fetch repo again with depth=1

+- name: DEPTH | fetch repo again with depth=1

   git:

     repo: 'file://{{ repo_dir|expanduser }}/shallow'

     dest: '{{ checkout_dir }}'

@@ -33,22 +33,22 @@

 - assert:

     that: "not checkout2|changed"

-  when: git_version.stdout | version_compare("{{git_version_supporting_depth}}", '>=')

+  when: git_version.stdout | version_compare(git_version_supporting_depth, '>=')

-- name: again try to access earlier commit

+- name: DEPTH | again try to access earlier commit

   shell: "git checkout {{git_shallow_head_1.stdout}}"

   register: checkout_early

   failed_when: False

   args:

     chdir: '{{ checkout_dir }}'

-- name: again make sure the old commit was not fetched

+- name: DEPTH | again make sure the old commit was not fetched

   assert:

     that: 'checkout_early.rc != 0'

-  when: git_version.stdout | version_compare("{{git_version_supporting_depth}}", '>=')

+  when: git_version.stdout | version_compare(git_version_supporting_depth, '>=')

 # make sure we are still able to fetch other versions

-- name: Clone same repo with older version

+- name: DEPTH | Clone same repo with older version

   git:

     repo: 'file://{{ repo_dir|expanduser }}/shallow'

     dest: '{{ checkout_dir }}'

@@ -57,20 +57,20 @@

   register: cloneold

 - assert:

-    that: "cloneold|success"

+    that: cloneold | success

-- name: try to access earlier commit

+- name: DEPTH | try to access earlier commit

   shell: "git checkout {{git_shallow_head_1.stdout}}"

   args:

     chdir: '{{ checkout_dir }}'

-- name: clear checkout_dir

+- name: DEPTH | clear checkout_dir

   file:

     state: absent

     path: "{{ checkout_dir }}"

 # Test for https://github.com/ansible/ansible/issues/21316

-- name: Shallow clone with tag

+- name: DEPTH | Shallow clone with tag

   git:

     repo: 'file://{{ repo_dir|expanduser }}/shallow'

     dest: '{{ checkout_dir }}'

@@ -79,9 +79,9 @@

   register: cloneold

 - assert:

-    that: "cloneold|success"

+    that: cloneold | success

-- name: clear checkout_dir

+- name: DEPTH | clear checkout_dir

   file:

     state: absent

     path: "{{ checkout_dir }}"

@@ -90,14 +90,14 @@

   # Test for https://github.com/ansible/ansible-modules-core/issues/3456

   # clone a repo with depth and version specified

-- name: clone repo with both version and depth specified

+- name: DEPTH | clone repo with both version and depth specified

   git:

     repo: 'file://{{ repo_dir|expanduser }}/shallow'

     dest: '{{ checkout_dir }}'

     depth: 1

     version: master

-- name: run a second time (now fetch, not clone)

+- name: DEPTH | run a second time (now fetch, not clone)

   git:

     repo: 'file://{{ repo_dir|expanduser }}/shallow'

     dest: '{{ checkout_dir }}'

@@ -105,22 +105,24 @@

     version: master

   register: git_fetch

-- name: ensure the fetch succeeded

+- name: DEPTH | ensure the fetch succeeded

   assert:

-    that: git_fetch|success

+    that: git_fetch | success

-- name: clear checkout_dir

-  file: state=absent path={{ checkout_dir }}

+- name: DEPTH | clear checkout_dir

+  file:

+    state: absent

+    path: "{{ checkout_dir }}"

-- name: clone repo with both version and depth specified

+- name: DEPTH | clone repo with both version and depth specified

   git:

     repo: 'file://{{ repo_dir|expanduser }}/shallow'

     dest: '{{ checkout_dir }}'

     depth: 1

     version: master

-- name: switch to older branch with depth=1 (uses fetch)

+- name: DEPTH | switch to older branch with depth=1 (uses fetch)

   git:

     repo: 'file://{{ repo_dir|expanduser }}/shallow'

     dest: '{{ checkout_dir }}'

@@ -128,28 +130,30 @@

     version: earlybranch

   register: git_fetch

-- name: ensure the fetch succeeded

+- name: DEPTH | ensure the fetch succeeded

   assert:

-    that: git_fetch|success

+    that: git_fetch | success

-- name: clear checkout_dir

-  file: state=absent path={{ checkout_dir }}

+- name: DEPTH | clear checkout_dir

+  file:

+    state: absent

+    path: "{{ checkout_dir }}"

 # test for https://github.com/ansible/ansible-modules-core/issues/3782

 # make sure shallow fetch works when no version is specified

-- name: checkout old repo

+- name: DEPTH | checkout old repo

   git:

     repo: 'file://{{ repo_dir|expanduser }}/shallow'

     dest: '{{ checkout_dir }}'

     depth: 1

-- name: "update repo"

+- name: DEPTH | "update repo"

   shell: echo "3" > a; git commit -a -m "3"

   args:

-    chdir: "{{repo_dir}}/shallow"

+    chdir: "{{ repo_dir }}/shallow"

-- name: fetch updated repo

+- name: DEPTH | fetch updated repo

   git:

     repo: 'file://{{ repo_dir|expanduser }}/shallow'

     dest: '{{ checkout_dir }}'

@@ -157,13 +161,13 @@

   register: git_fetch

   ignore_errors: yes

-- name: check update arrived

+- name: DEPTH | check update arrived

   assert:

     that:

       - "{{ lookup('file', checkout_dir+'/a' )}} == 3"

-      - git_fetch|changed

+      - git_fetch | changed

-- name: clear checkout_dir

+- name: DEPTH | clear checkout_dir

   file:

     state: absent

     path: "{{ checkout_dir }}"

@@ -1,12 +1,10 @@

-

-- name: initial checkout

+- name: FORMATS | initial checkout

   git:

     repo: "{{ repo_format1 }}"

     dest: "{{ repo_dir }}/format1"

   register: git_result

-- name: verify information about the initial clone

+- name: FORMATS | verify information about the initial clone

   assert:

     that:

       - "'before' in git_result"

@@ -14,29 +12,29 @@

       - "not git_result.before"

       - "git_result.changed"

-- name: repeated checkout

+- name: FORMATS | repeated checkout

   git:

     repo: "{{ repo_format1 }}"

     dest: "{{ repo_dir }}/format1"

   register: git_result2

-- name: check for tags

+- name: FORMATS | check for tags

   stat:

     path: "{{ repo_dir }}/format1/.git/refs/tags"

   register: tags

-- name: check for HEAD

+- name: FORMATS | check for HEAD

   stat:

     path: "{{ repo_dir }}/format1/.git/HEAD"

   register: head

-- name: assert presence of tags/trunk/branches

+- name: FORMATS | assert presence of tags/trunk/branches

   assert:

     that:

       - "tags.stat.isdir"

       - "head.stat.isreg"

-- name: verify on a reclone things are marked unchanged

+- name: FORMATS | verify on a reclone things are marked unchanged

   assert:

     that:

       - "not git_result2.changed"

@@ -1,40 +1,39 @@

 # Test for verification of GnuPG signatures

-- name: Create GnuPG verification workdir

+- name: GPG-VERIFICATION | Create GnuPG verification workdir

   tempfile:

     state: directory

   register: git_gpg_workdir

-- name: Define variables based on workdir

+- name: GPG-VERIFICATION | Define variables based on workdir

   set_fact:

     git_gpg_keyfile: "{{ git_gpg_workdir.path }}/testkey.asc"

     git_gpg_source: "{{ git_gpg_workdir.path }}/source"

     git_gpg_dest: "{{ git_gpg_workdir.path }}/dest"

     git_gpg_gpghome: "{{ git_gpg_workdir.path }}/gpg"

-- name: Temporary store GnuPG test key

+- name: GPG-VERIFICATION | Temporary store GnuPG test key

   copy:

     content: "{{ git_gpg_testkey }}"

     dest: "{{ git_gpg_keyfile }}"

-- name: Create temporary GNUPGHOME directory

+- name: GPG-VERIFICATION | Create temporary GNUPGHOME directory

   file:

     path: "{{ git_gpg_gpghome }}"

     state: directory

     mode: 0700

-- name: Import GnuPG test key

+- name: GPG-VERIFICATION | Import GnuPG test key

   environment:

     - GNUPGHOME: "{{ git_gpg_gpghome }}"

   command: gpg --import {{ git_gpg_keyfile }}

-- name: Create local GnuPG signed repository directory

+- name: GPG-VERIFICATION | Create local GnuPG signed repository directory

   file:

     path: "{{ git_gpg_source }}"

     state: directory

-- name: Generate local GnuPG signed repository

+- name: GPG-VERIFICATION | Generate local GnuPG signed repository

   environment:

     - GNUPGHOME: "{{ git_gpg_gpghome }}"

   shell: |

@@ -57,19 +56,19 @@

   args:

     chdir: "{{ git_gpg_source }}"

-- name: Get hash of an unsigned commit

+- name: GPG-VERIFICATION | Get hash of an unsigned commit

   command: git show-ref --hash --verify refs/tags/lightweight_tag/unsigned_commit

   args:

     chdir: "{{ git_gpg_source }}"

   register: git_gpg_unsigned_commit

-- name: Get hash of a signed commit

+- name: GPG-VERIFICATION | Get hash of a signed commit

   command: git show-ref --hash --verify refs/tags/lightweight_tag/signed_commit

   args:

     chdir: "{{ git_gpg_source }}"

   register: git_gpg_signed_commit

-- name: Clone repo and verify signed HEAD

+- name: GPG-VERIFICATION | Clone repo and verify signed HEAD

   environment:

     - GNUPGHOME: "{{ git_gpg_gpghome }}"

   git:

@@ -77,7 +76,7 @@

     dest: "{{ git_gpg_dest }}"

     verify_commit: yes

-- name: Clone repo and verify a signed lightweight tag

+- name: GPG-VERIFICATION | Clone repo and verify a signed lightweight tag

   environment:

     - GNUPGHOME: "{{ git_gpg_gpghome }}"

   git:

@@ -86,7 +85,7 @@

     version: lightweight_tag/signed_commit

     verify_commit: yes

-- name: Clone repo and verify an unsigned lightweight tag (should fail)

+- name: GPG-VERIFICATION | Clone repo and verify an unsigned lightweight tag (should fail)

   environment:

     - GNUPGHOME: "{{ git_gpg_gpghome }}"

   git:

@@ -97,13 +96,13 @@

   register: git_verify

   ignore_errors: yes

-- name: Check that unsigned lightweight tag verification failed

+- name: GPG-VERIFICATION | Check that unsigned lightweight tag verification failed

   assert:

     that:

       - git_verify|failed

       - git_verify.msg|match("Failed to verify GPG signature of commit/tag.+")

-- name: Clone repo and verify a signed commit

+- name: GPG-VERIFICATION | Clone repo and verify a signed commit

   environment:

     - GNUPGHOME: "{{ git_gpg_gpghome }}"

   git:

@@ -112,7 +111,7 @@

     version: "{{ git_gpg_signed_commit.stdout }}"

     verify_commit: yes

-- name: Clone repo and verify an unsigned commit

+- name: GPG-VERIFICATION | Clone repo and verify an unsigned commit

   environment:

     - GNUPGHOME: "{{ git_gpg_gpghome }}"

   git:

@@ -123,13 +122,13 @@

   register: git_verify

   ignore_errors: yes

-- name: Check that unsigned commit verification failed

+- name: GPG-VERIFICATION | Check that unsigned commit verification failed

   assert:

     that:

       - git_verify|failed

       - git_verify.msg|match("Failed to verify GPG signature of commit/tag.+")

-- name: Clone repo and verify a signed annotated tag

+- name: GPG-VERIFICATION | Clone repo and verify a signed annotated tag

   environment:

     - GNUPGHOME: "{{ git_gpg_gpghome }}"

   git:

@@ -138,7 +137,7 @@

     version: signed_annotated_tag

     verify_commit: yes

-- name: Clone repo and verify an unsigned annotated tag (should fail)

+- name: GPG-VERIFICATION | Clone repo and verify an unsigned annotated tag (should fail)

   environment:

     - GNUPGHOME: "{{ git_gpg_gpghome }}"

   git:

@@ -149,13 +148,13 @@

   register: git_verify

   ignore_errors: yes

-- name: Check that unsigned annotated tag verification failed

+- name: GPG-VERIFICATION | Check that unsigned annotated tag verification failed

   assert:

     that:

       - git_verify|failed

       - git_verify.msg|match("Failed to verify GPG signature of commit/tag.+")

-- name: Clone repo and verify a signed branch

+- name: GPG-VERIFICATION | Clone repo and verify a signed branch

   environment:

     - GNUPGHOME: "{{ git_gpg_gpghome }}"

   git:

@@ -164,7 +163,7 @@

     version: some_branch/signed_tip

     verify_commit: yes

-- name: Clone repo and verify an unsigned branch (should fail)

+- name: GPG-VERIFICATION | Clone repo and verify an unsigned branch (should fail)

   environment:

     - GNUPGHOME: "{{ git_gpg_gpghome }}"

   git:

@@ -175,13 +174,13 @@

   register: git_verify

   ignore_errors: yes

-- name: Check that unsigned branch verification failed

+- name: GPG-VERIFICATION | Check that unsigned branch verification failed

   assert:

     that:

       - git_verify|failed

       - git_verify.msg|match("Failed to verify GPG signature of commit/tag.+")

-- name: Remove GnuPG verification workdir

+- name: GPG-VERIFICATION | Remove GnuPG verification workdir

   file:

     path: "{{ git_gpg_workdir.path }}"

     state: absent

@@ -1,39 +1,37 @@

-

 # test for https://github.com/ansible/ansible-modules-core/pull/5505

-- name: prepare old git repo

+- name: LOCALMODS | prepare old git repo

   shell: rm -rf localmods; mkdir localmods; cd localmods; git init; echo "1" > a; git add a; git commit -m "1"

   args:

     chdir: "{{repo_dir}}"

-- name: checkout old repo

+- name: LOCALMODS | checkout old repo

   git:

     repo: '{{ repo_dir }}/localmods'

     dest: '{{ checkout_dir }}'

-- name: "update repo"

+- name: LOCALMODS | "update repo"

   shell: echo "2" > a; git commit -a -m "2"

   args:

     chdir: "{{repo_dir}}/localmods"

-- name: "add local mods"

+- name: LOCALMODS | "add local mods"

   shell: echo "3" > a

   args:

     chdir: "{{ checkout_dir }}"

-- name: fetch with local mods without force (should fail)

+- name: LOCALMODS | fetch with local mods without force (should fail)

   git:

     repo: '{{ repo_dir }}/localmods'

     dest: '{{ checkout_dir }}'

   register: git_fetch

   ignore_errors: yes

-- name: check fetch with localmods failed

+- name: LOCALMODS | check fetch with localmods failed

   assert:

     that:

       - git_fetch|failed

-- name: fetch with local mods with force

+- name: LOCALMODS | fetch with local mods with force

   git:

     repo: '{{ repo_dir }}/localmods'

     dest: '{{ checkout_dir }}'

@@ -41,38 +39,38 @@

   register: git_fetch_force

   ignore_errors: yes

-- name: check update arrived

+- name: LOCALMODS | check update arrived

   assert:

     that:

       - "{{ lookup('file', checkout_dir+'/a' )}} == 2"

       - git_fetch_force|changed

-- name: clear checkout_dir

+- name: LOCALMODS | clear checkout_dir

   file: state=absent path={{ checkout_dir }}

 # localmods and shallow clone

-- name: prepare old git repo

+- name: LOCALMODS | prepare old git repo

   shell: rm -rf localmods; mkdir localmods; cd localmods; git init; echo "1" > a; git add a; git commit -m "1"

   args:

     chdir: "{{repo_dir}}"

-- name: checkout old repo

+- name: LOCALMODS | checkout old repo

   git:

     repo: '{{ repo_dir }}/localmods'

     dest: '{{ checkout_dir }}'

     depth: 1

-- name: "update repo"

+- name: LOCALMODS | "update repo"

   shell: echo "2" > a; git commit -a -m "2"

   args:

     chdir: "{{repo_dir}}/localmods"

-- name: "add local mods"

+- name: LOCALMODS | "add local mods"

   shell: echo "3" > a

   args:

     chdir: "{{ checkout_dir }}"

-- name: fetch with local mods without force (should fail)

+- name: LOCALMODS | fetch with local mods without force (should fail)

   git:

     repo: '{{ repo_dir }}/localmods'

     dest: '{{ checkout_dir }}'

@@ -80,12 +78,12 @@

   register: git_fetch

   ignore_errors: yes

-- name: check fetch with localmods failed

+- name: LOCALMODS | check fetch with localmods failed

   assert:

     that:

       - git_fetch|failed

-- name: fetch with local mods with force

+- name: LOCALMODS | fetch with local mods with force

   git:

     repo: '{{ repo_dir }}/localmods'

     dest: '{{ checkout_dir }}'

@@ -94,11 +92,11 @@

   register: git_fetch_force

   ignore_errors: yes

-- name: check update arrived

+- name: LOCALMODS | check update arrived

   assert:

     that:

       - "{{ lookup('file', checkout_dir+'/a' )}} == 2"

       - git_fetch_force|changed

-- name: clear checkout_dir

+- name: LOCALMODS | clear checkout_dir

   file: state=absent path={{ checkout_dir }}