From 9785d5b2fbd7cd07f6d817317e5c78e94ad07fb0 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Tue, 28 Mar 2017 13:59:23 -0700 Subject: [PATCH] Fix synchronize tests for the updated quoting change between action and module (cherry picked from commit b0d75a0ecbbb6b64c42746adf009487d74397af0) --- .../action/fixtures/synchronize/basic_become/meta.yaml | 2 +- .../fixtures/synchronize/basic_become/task_args_out.json | 4 ++-- .../action/fixtures/synchronize/basic_become_cli/meta.yaml | 2 +- .../fixtures/synchronize/basic_become_cli/task_args_out.json | 4 ++-- .../synchronize/delegate_remote_su/task_args_out.json | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/units/plugins/action/fixtures/synchronize/basic_become/meta.yaml b/test/units/plugins/action/fixtures/synchronize/basic_become/meta.yaml index c507b3271af..1ba3b4ab9be 100644 --- a/test/units/plugins/action/fixtures/synchronize/basic_become/meta.yaml +++ b/test/units/plugins/action/fixtures/synchronize/basic_become/meta.yaml @@ -25,7 +25,7 @@ asserts: - "self.execute_called" - "self.final_module_args['_local_rsync_path'] == 'rsync'" # this is a crucial aspect of this scenario ... - - "self.final_module_args['rsync_path'] == '\"sudo rsync\"'" + - "self.final_module_args['rsync_path'] == 'sudo rsync'" - "self.final_module_args['src'] == '/tmp/deleteme'" - "self.final_module_args['dest'] == 'root@el6host:/tmp/deleteme'" - "self.task.become == True" diff --git a/test/units/plugins/action/fixtures/synchronize/basic_become/task_args_out.json b/test/units/plugins/action/fixtures/synchronize/basic_become/task_args_out.json index c1aff9c33c1..27f8e2581ca 100644 --- a/test/units/plugins/action/fixtures/synchronize/basic_become/task_args_out.json +++ b/test/units/plugins/action/fixtures/synchronize/basic_become/task_args_out.json @@ -1,6 +1,6 @@ { "dest": "root@el6host:/tmp/deleteme", "src": "/tmp/deleteme", - "rsync_path": "\"sudo rsync\"", + "rsync_path": "sudo rsync", "_local_rsync_path": "rsync" -} \ No newline at end of file +} diff --git a/test/units/plugins/action/fixtures/synchronize/basic_become_cli/meta.yaml b/test/units/plugins/action/fixtures/synchronize/basic_become_cli/meta.yaml index ae8b295df29..5e558012a56 100644 --- a/test/units/plugins/action/fixtures/synchronize/basic_become_cli/meta.yaml +++ b/test/units/plugins/action/fixtures/synchronize/basic_become_cli/meta.yaml @@ -25,7 +25,7 @@ asserts: - "self.execute_called" - "self.final_module_args['_local_rsync_path'] == 'rsync'" # this is a crucial aspect of this scenario ... - - "self.final_module_args['rsync_path'] == '\"sudo rsync\"'" + - "self.final_module_args['rsync_path'] == 'sudo rsync'" - "self.final_module_args['src'] == '/tmp/deleteme'" - "self.final_module_args['dest'] == 'root@el6host:/tmp/deleteme'" - "self.task.become == None" diff --git a/test/units/plugins/action/fixtures/synchronize/basic_become_cli/task_args_out.json b/test/units/plugins/action/fixtures/synchronize/basic_become_cli/task_args_out.json index c1aff9c33c1..27f8e2581ca 100644 --- a/test/units/plugins/action/fixtures/synchronize/basic_become_cli/task_args_out.json +++ b/test/units/plugins/action/fixtures/synchronize/basic_become_cli/task_args_out.json @@ -1,6 +1,6 @@ { "dest": "root@el6host:/tmp/deleteme", "src": "/tmp/deleteme", - "rsync_path": "\"sudo rsync\"", + "rsync_path": "sudo rsync", "_local_rsync_path": "rsync" -} \ No newline at end of file +} diff --git a/test/units/plugins/action/fixtures/synchronize/delegate_remote_su/task_args_out.json b/test/units/plugins/action/fixtures/synchronize/delegate_remote_su/task_args_out.json index f1f25ddac17..57257dbd5b3 100644 --- a/test/units/plugins/action/fixtures/synchronize/delegate_remote_su/task_args_out.json +++ b/test/units/plugins/action/fixtures/synchronize/delegate_remote_su/task_args_out.json @@ -1,6 +1,6 @@ { "dest": "el6host:/tmp/deleteme", "src": "/tmp/deleteme", - "rsync_path": "\"sudo rsync\"", + "rsync_path": "sudo rsync", "_local_rsync_path": "rsync" -} \ No newline at end of file +}