From d5f7cf0b22b7ec72f46117a66e71ce92338820cd Mon Sep 17 00:00:00 2001 From: Mandar Kulkarni Date: Thu, 5 Aug 2021 16:15:45 -0700 Subject: [PATCH] Modify based on feedback --- plugins/modules/synchronize.py | 2 +- .../integration/targets/synchronize/tasks/main.yml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/modules/synchronize.py b/plugins/modules/synchronize.py index a96488d..729b374 100644 --- a/plugins/modules/synchronize.py +++ b/plugins/modules/synchronize.py @@ -636,7 +636,7 @@ def main(): result = dict(changed=changed, rc=rc, cmd=cmdstr, stdout_lines=out_lines, msg=out_clean) if quiet: - changes = len(out_lines) - 1 if len(out_lines) >= 1 else 0 + changes = out.count(changed_marker) if changed else 0 result['msg'] = "%s files/directories have been synchronized" % changes if module._diff: diff --git a/tests/integration/targets/synchronize/tasks/main.yml b/tests/integration/targets/synchronize/tasks/main.yml index a5153d8..4b521f4 100644 --- a/tests/integration/targets/synchronize/tasks/main.yml +++ b/tests/integration/targets/synchronize/tasks/main.yml @@ -229,8 +229,8 @@ - directory_b - name: synchronize files with quiet option synchronize: - src: '{{output_dir}}/foo.txt' - dest: '{{output_dir}}/foo.result' + src: '{{ output_dir }}/foo.txt' + dest: '{{ output_dir }}/foo.result' quiet: true register: sync_result ignore_errors: true @@ -240,14 +240,14 @@ - name: Cleanup file: state: absent - path: '{{output_dir}}/{{item}}' - with_items: + path: '{{ output_dir }}/{{ item }}' + loop: - foo.result - bar.result - name: synchronize files without quiet option synchronize: - src: '{{output_dir}}/foo.txt' - dest: '{{output_dir}}/foo.result' + src: '{{ output_dir }}/foo.txt' + dest: '{{ output_dir }}/foo.result' register: sync_result ignore_errors: true - assert: @@ -256,7 +256,7 @@ - name: Cleanup file: state: absent - path: '{{output_dir}}/{{item}}' + path: '{{ output_dir }}/{{ item }}' with_items: - foo.result - bar.result