From 30169c76ded9194b6b47ff274e4ba6e5a16df8ea Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Thu, 2 Nov 2023 16:12:13 -0700 Subject: [PATCH] Replace Unicode no-break spaces with ASCII spaces --- lib/ansible/modules/subversion.py | 2 +- .../tasks/dest_in_non_existent_directories.yml | 6 +++--- ...dest_in_non_existent_directories_remote_src.yml | 6 +++--- .../src_file_dest_file_in_non_existent_dir.yml | 4 ++-- ...le_dest_file_in_non_existent_dir_remote_src.yml | 4 ++-- test/integration/targets/copy/tasks/tests.yml | 14 +++++++------- test/integration/targets/file/tasks/state_link.yml | 6 +++--- .../targets/gathering_facts/test_run_once.yml | 2 +- .../targets/include_vars/tasks/main.yml | 8 ++++---- test/integration/targets/service/tasks/main.yml | 2 +- .../targets/service/tasks/upstart_cleanup.yml | 2 +- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lib/ansible/modules/subversion.py b/lib/ansible/modules/subversion.py index 8d8a979220e..ac2a17e599a 100644 --- a/lib/ansible/modules/subversion.py +++ b/lib/ansible/modules/subversion.py @@ -141,7 +141,7 @@ from ansible.module_utils.compat.version import LooseVersion class Subversion(object): # Example text matched by the regexp: - # Révision : 1889134 + # Révision : 1889134 # 版本: 1889134 # Revision: 1889134 REVISION_RE = r'^\w+\s?:\s+\d+$' diff --git a/test/integration/targets/copy/tasks/dest_in_non_existent_directories.yml b/test/integration/targets/copy/tasks/dest_in_non_existent_directories.yml index c86caa1e748..12d47b399de 100644 --- a/test/integration/targets/copy/tasks/dest_in_non_existent_directories.yml +++ b/test/integration/targets/copy/tasks/dest_in_non_existent_directories.yml @@ -2,13 +2,13 @@ # checks that dest is created - name: Ensure that dest top directory doesn't exist file: - path: '{{ remote_dir }}/{{ item.dest.split("/")[0] }}' + path: '{{ remote_dir }}/{{ item.dest.split("/")[0] }}' state: absent - name: Copy file, dest is a nonexistent target directory copy: - src: '{{ item.src }}' - dest: '{{ remote_dir }}/{{ item.dest }}' + src: '{{ item.src }}' + dest: '{{ remote_dir }}/{{ item.dest }}' register: copy_result - name: assert copy worked diff --git a/test/integration/targets/copy/tasks/dest_in_non_existent_directories_remote_src.yml b/test/integration/targets/copy/tasks/dest_in_non_existent_directories_remote_src.yml index fad53e71db6..d42318f9c80 100644 --- a/test/integration/targets/copy/tasks/dest_in_non_existent_directories_remote_src.yml +++ b/test/integration/targets/copy/tasks/dest_in_non_existent_directories_remote_src.yml @@ -2,7 +2,7 @@ # checks that dest is created - name: Ensure that dest top directory doesn't exist file: - path: '{{ remote_dir }}/{{ item.dest.split("/")[0] }}' + path: '{{ remote_dir }}/{{ item.dest.split("/")[0] }}' state: absent - name: create subdir @@ -20,8 +20,8 @@ - name: Copy file, dest is a nonexistent target directory copy: - src: '{{ item.src }}' - dest: '{{ remote_dir }}/{{ item.dest }}' + src: '{{ item.src }}' + dest: '{{ remote_dir }}/{{ item.dest }}' remote_src: true register: copy_result diff --git a/test/integration/targets/copy/tasks/src_file_dest_file_in_non_existent_dir.yml b/test/integration/targets/copy/tasks/src_file_dest_file_in_non_existent_dir.yml index f4ab9998a66..b7b77babd8e 100644 --- a/test/integration/targets/copy/tasks/src_file_dest_file_in_non_existent_dir.yml +++ b/test/integration/targets/copy/tasks/src_file_dest_file_in_non_existent_dir.yml @@ -1,6 +1,6 @@ - name: Ensure that dest top directory doesn't exist file: - path: '{{ remote_dir }}/{{ dest.split("/")[0] }}' + path: '{{ remote_dir }}/{{ dest.split("/")[0] }}' state: absent - name: Copy file, dest is a file in non-existing target directory @@ -17,7 +17,7 @@ - name: Stat dest path stat: - path: '{{ remote_dir }}/{{ dest.split("/")[0] }}' + path: '{{ remote_dir }}/{{ dest.split("/")[0] }}' register: stat_file_in_dir_result - name: assert that dest doesn't exist diff --git a/test/integration/targets/copy/tasks/src_file_dest_file_in_non_existent_dir_remote_src.yml b/test/integration/targets/copy/tasks/src_file_dest_file_in_non_existent_dir_remote_src.yml index 61d8796968b..2f51cb5ab82 100644 --- a/test/integration/targets/copy/tasks/src_file_dest_file_in_non_existent_dir_remote_src.yml +++ b/test/integration/targets/copy/tasks/src_file_dest_file_in_non_existent_dir_remote_src.yml @@ -1,6 +1,6 @@ - name: Ensure that dest top directory doesn't exist file: - path: '{{ remote_dir }}/{{ dest.split("/")[0] }}' + path: '{{ remote_dir }}/{{ dest.split("/")[0] }}' state: absent - name: create src file @@ -23,7 +23,7 @@ - name: Stat dest path stat: - path: '{{ remote_dir }}/{{ dest.split("/")[0] }}' + path: '{{ remote_dir }}/{{ dest.split("/")[0] }}' register: stat_file_in_dir_result - name: assert that dest doesn't exist diff --git a/test/integration/targets/copy/tasks/tests.yml b/test/integration/targets/copy/tasks/tests.yml index c2b8482353c..fb82c291fd5 100644 --- a/test/integration/targets/copy/tasks/tests.yml +++ b/test/integration/targets/copy/tasks/tests.yml @@ -999,13 +999,13 @@ - name: Create a directory outside of the tree file: - path: '{{ local_temp_dir }}/source2' + path: '{{ local_temp_dir }}/source2' state: directory - name: Create a symlink to a directory outside of the tree file: path: '{{ local_temp_dir }}/source1/link' - src: '{{ local_temp_dir }}/source2' + src: '{{ local_temp_dir }}/source2' state: link - name: Create a circular link back to the tree @@ -1075,7 +1075,7 @@ - name: Create a file inside of the directory copy: content: "testing" - dest: '{{ local_temp_dir }}/source_recursive/file' + dest: '{{ local_temp_dir }}/source_recursive/file' - name: Create a directory to place the test output in file: @@ -1456,7 +1456,7 @@ block: - name: Create a test dir to copy file: - path: '{{ local_temp_dir }}/top_dir' + path: '{{ local_temp_dir }}/top_dir' state: directory - name: Create a test dir to symlink to @@ -1466,7 +1466,7 @@ - name: Create a file in the test dir copy: - dest: '{{ local_temp_dir }}/linked_dir/file1' + dest: '{{ local_temp_dir }}/linked_dir/file1' content: 'hello world' - name: Create a link to the test dir @@ -1489,7 +1489,7 @@ - name: Copy the directory's link copy: - src: '{{ local_temp_dir }}/top_dir' + src: '{{ local_temp_dir }}/top_dir' dest: '{{ remote_dir }}/new_dir' local_follow: True @@ -2056,7 +2056,7 @@ dest: '{{ remote_dir }}/testcase5_remote_src_subdirs_src' - name: Create a 2nd level subdirectory file: - path: '{{ remote_dir }}/testcase5_remote_src_subdirs_src/subdir/subdir2/' + path: '{{ remote_dir }}/testcase5_remote_src_subdirs_src/subdir/subdir2/' state: directory - name: execute - Copy the directory on remote copy: diff --git a/test/integration/targets/file/tasks/state_link.yml b/test/integration/targets/file/tasks/state_link.yml index 673fe6fd529..374e97e25fc 100644 --- a/test/integration/targets/file/tasks/state_link.yml +++ b/test/integration/targets/file/tasks/state_link.yml @@ -186,11 +186,11 @@ - name: Delete unprivileged user home and tempdir file: - path: "{{ item }}" + path: "{{ item }}" state: absent loop: - '{{ tempdir.path }}' - - '{{ user.home }}' + - '{{ user.home }}' - name: verify that link was created assert: @@ -199,7 +199,7 @@ - "missing_dst_no_follow_enable_force_use_mode2 is changed" - "missing_dst_no_follow_enable_force_use_mode3 is not changed" - "soft3_result['stat'].islnk" - - "soft3_result['stat'].lnk_target == '{{ user.home }}/nonexistent'" + - "soft3_result['stat'].lnk_target == '{{ user.home }}/nonexistent'" # # Test creating a link to a directory https://github.com/ansible/ansible/issues/1369 diff --git a/test/integration/targets/gathering_facts/test_run_once.yml b/test/integration/targets/gathering_facts/test_run_once.yml index 37023b242b6..35591f269c9 100644 --- a/test/integration/targets/gathering_facts/test_run_once.yml +++ b/test/integration/targets/gathering_facts/test_run_once.yml @@ -24,7 +24,7 @@ - name: "Check that run_once doesn't prevent fact gathering (#39453)" assert: that: 'hostvars.facthost1.ansible_local.uuid != hostvars.facthost2.ansible_local.uuid' - msg: "{{ 'Same value for ansible_local.uuid on both hosts: ' ~ hostvars.facthost1.ansible_local.uuid }}" + msg: "{{ 'Same value for ansible_local.uuid on both hosts: ' ~ hostvars.facthost1.ansible_local.uuid }}" always: - name: remove test local facts file: diff --git a/test/integration/targets/include_vars/tasks/main.yml b/test/integration/targets/include_vars/tasks/main.yml index b6ca414fe6d..62c7118348d 100644 --- a/test/integration/targets/include_vars/tasks/main.yml +++ b/test/integration/targets/include_vars/tasks/main.yml @@ -15,7 +15,7 @@ that: - "testing == 789" - "base_dir == 'environments/development'" - - "{{ included_one_file.ansible_included_var_files | length }} == 1" + - "{{ included_one_file.ansible_included_var_files | length }} == 1" - "'vars/environments/development/all.yml' in included_one_file.ansible_included_var_files[0]" - name: include the vars/environments/development/all.yml and save results in all @@ -67,7 +67,7 @@ - "testing == 456" - "base_dir == 'services'" - "webapp_containers == 10" - - "{{ include_every_dir.ansible_included_var_files | length }} == 7" + - "{{ include_every_dir.ansible_included_var_files | length }} == 7" - "'vars/all/all.yml' in include_every_dir.ansible_included_var_files[0]" - "'vars/environments/development/all.yml' in include_every_dir.ansible_included_var_files[1]" - "'vars/environments/development/services/webapp.yml' in include_every_dir.ansible_included_var_files[2]" @@ -88,7 +88,7 @@ that: - "testing == 789" - "base_dir == 'environments/development'" - - "{{ include_without_webapp.ansible_included_var_files | length }} == 4" + - "{{ include_without_webapp.ansible_included_var_files | length }} == 4" - "'webapp.yml' not in '{{ include_without_webapp.ansible_included_var_files | join(' ') }}'" - "'file_without_extension' not in '{{ include_without_webapp.ansible_included_var_files | join(' ') }}'" @@ -104,7 +104,7 @@ - "testing == 101112" - "base_dir == 'development/services'" - "webapp_containers == 20" - - "{{ include_match_webapp.ansible_included_var_files | length }} == 1" + - "{{ include_match_webapp.ansible_included_var_files | length }} == 1" - "'vars/environments/development/services/webapp.yml' in include_match_webapp.ansible_included_var_files[0]" - "'all.yml' not in '{{ include_match_webapp.ansible_included_var_files | join(' ') }}'" diff --git a/test/integration/targets/service/tasks/main.yml b/test/integration/targets/service/tasks/main.yml index 4fc2ddfe32f..7a4ecda5e7d 100644 --- a/test/integration/targets/service/tasks/main.yml +++ b/test/integration/targets/service/tasks/main.yml @@ -46,7 +46,7 @@ msg: 'ansible_service_mgr: {{ ansible_service_mgr }}' - name: setup test service script - include_tasks: '{{ service_type }}_setup.yml' + include_tasks: '{{ service_type }}_setup.yml' - name: execute tests import_tasks: tests.yml diff --git a/test/integration/targets/service/tasks/upstart_cleanup.yml b/test/integration/targets/service/tasks/upstart_cleanup.yml index 683fb104aba..fa418fe2315 100644 --- a/test/integration/targets/service/tasks/upstart_cleanup.yml +++ b/test/integration/targets/service/tasks/upstart_cleanup.yml @@ -11,7 +11,7 @@ loop: '{{ upstart_files }}' - name: assert that upstart init files were removed - raw: 'test -e {{ item }}' + raw: 'test -e {{ item }}' loop: '{{ upstart_files }}' register: file_exists failed_when: file_exists is not failed