Make sure all files have trailing newline (#5076) (#5081)

* Make sure all files have trailing newline.

* Adjust tests.

(cherry picked from commit fa6c009ff0)

tests/integration/targets/gitlab_group_variable/tasks/main.yml

@@ -700,4 +700,3 @@
     that:
       - gitlab_group_variable_state.changed
       - gitlab_group_variable_state.group_variable.removed|length == 1
-      

tests/integration/targets/kernel_blacklist/tasks/main.yml

@@ -44,7 +44,7 @@
     - orig_stat.stat.size == stat_test_1.stat.size
     - orig_stat.stat.checksum == stat_test_1.stat.checksum
     - orig_stat.stat.mtime == stat_test_1.stat.mtime
-    - stat_test_1.stat.checksum == 'blacklist aaaa\nblacklist bbbb\nblacklist cccc'|checksum
+    - stat_test_1.stat.checksum == 'blacklist aaaa\nblacklist bbbb\nblacklist cccc\n' | checksum
 
 - name: add new item to list
   community.general.kernel_blacklist:

tests/integration/targets/mssql_script/tasks/main.yml

@@ -221,4 +221,3 @@
       - empty_result.query_results[0][1] | length == 0
       - empty_result.query_results[0][2][0][0] == 'msdb'
   failed_when: false  # known issue
-      

tests/integration/targets/xml/tasks/test-add-children-elements-unicode.yml

@@ -17,6 +17,9 @@
       - beer: Окское
     register: add_children_elements_unicode
 
+  - name: Add trailing newline
+    shell: echo "" >> /tmp/ansible-xml-beers.xml
+
   - name: Compare to expected result
     copy:
       src: results/test-add-children-elements-unicode.xml

tests/integration/targets/xml/tasks/test-add-children-elements.yml

@@ -17,6 +17,9 @@
       - beer: Old Rasputin
     register: add_children_elements
 
+  - name: Add trailing newline
+    shell: echo "" >> /tmp/ansible-xml-beers.xml
+
   - name: Compare to expected result
     copy:
       src: results/test-add-children-elements.xml

tests/integration/targets/xml/tasks/test-add-children-from-groupvars.yml

@@ -16,6 +16,9 @@
       add_children: '{{ bad_beers }}'
     register: add_children_from_groupvars
 
+  - name: Add trailing newline
+    shell: echo "" >> /tmp/ansible-xml-beers.xml
+
   - name: Compare to expected result
     copy:
       src: results/test-add-children-from-groupvars.xml

tests/integration/targets/xml/tasks/test-add-children-with-attributes-unicode.yml

@@ -19,6 +19,9 @@
           type: экстра
     register: add_children_with_attributes_unicode
 
+  - name: Add trailing newline
+    shell: echo "" >> /tmp/ansible-xml-beers.xml
+
   - name: Compare to expected result
     copy:
       src: results/test-add-children-with-attributes-unicode.xml

tests/integration/targets/xml/tasks/test-add-children-with-attributes.yml

@@ -19,6 +19,9 @@
           type: light
     register: add_children_with_attributes
 
+  - name: Add trailing newline
+    shell: echo "" >> /tmp/ansible-xml-beers.xml
+
   - name: Compare to expected result
     copy:
       src: results/test-add-children-with-attributes.xml

tests/integration/targets/xml/tasks/test-add-namespaced-children-elements.yml

@@ -20,6 +20,9 @@
       - beer: Old Rasputin
     register: add_namespaced_children_elements
 
+  - name: Add trailing newline
+    shell: echo "" >> /tmp/ansible-xml-namespaced-beers.xml
+
   - name: Compare to expected result
     copy:
       src: results/test-add-namespaced-children-elements.xml

tests/integration/targets/xml/tasks/test-children-elements-xml.yml

@@ -18,6 +18,9 @@
       - '<beer>Old Rasputin</beer>'
     register: children_elements
 
+  - name: Add trailing newline
+    shell: echo "" >> /tmp/ansible-xml-beers.xml
+
   - name: Compare to expected result
     copy:
       src: results/test-add-children-elements.xml

tests/integration/targets/xml/tasks/test-remove-attribute.yml

@@ -16,6 +16,9 @@
       state: absent
     register: remove_attribute
 
+  - name: Add trailing newline
+    shell: echo "" >> /tmp/ansible-xml-beers.xml
+
   - name: Compare to expected result
     copy:
       src: results/test-remove-attribute.xml

tests/integration/targets/xml/tasks/test-remove-element.yml

@@ -16,6 +16,9 @@
       state: absent
     register: remove_element
 
+  - name: Add trailing newline
+    shell: echo "" >> /tmp/ansible-xml-beers.xml
+
   - name: Compare to expected result
     copy:
       src: results/test-remove-element.xml

tests/integration/targets/xml/tasks/test-remove-namespaced-attribute.yml

@@ -21,6 +21,9 @@
       state: absent
     register: remove_namespaced_attribute
 
+  - name: Add trailing newline
+    shell: echo "" >> /tmp/ansible-xml-namespaced-beers.xml
+
   - name: Compare to expected result
     copy:
       src: results/test-remove-namespaced-attribute.xml

tests/integration/targets/xml/tasks/test-remove-namespaced-element.yml

@@ -21,6 +21,9 @@
       state: absent
     register: remove_namespaced_element
 
+  - name: Add trailing newline
+    shell: echo "" >> /tmp/ansible-xml-namespaced-beers.xml
+
   - name: Compare to expected result
     copy:
       src: results/test-remove-element.xml

tests/integration/targets/xml/tasks/test-set-attribute-value-unicode.yml

@@ -17,6 +17,9 @@
       value: нет
     register: set_attribute_value_unicode
 
+  - name: Add trailing newline
+    shell: echo "" >> /tmp/ansible-xml-beers.xml
+
   - name: Compare to expected result
     copy:
       src: results/test-set-attribute-value-unicode.xml

tests/integration/targets/xml/tasks/test-set-attribute-value.yml

@@ -17,6 +17,9 @@
       value: 'false'
     register: set_attribute_value
 
+  - name: Add trailing newline
+    shell: echo "" >> /tmp/ansible-xml-beers.xml
+
   - name: Compare to expected result
     copy:
       src: results/test-set-attribute-value.xml

tests/integration/targets/xml/tasks/test-set-children-elements-level.yml

@@ -40,6 +40,9 @@
                   quantity: 20g
     register: set_children_elements_level
 
+  - name: Add trailing newline
+    shell: echo "" >> /tmp/ansible-xml-beers.xml
+
   - name: Compare to expected result
     copy:
       src: results/test-set-children-elements-level.xml

tests/integration/targets/xml/tasks/test-set-children-elements-unicode.yml

@@ -18,6 +18,9 @@
       - beer: Невское
     register: set_children_elements_unicode
 
+  - name: Add trailing newline
+    shell: echo "" >> /tmp/ansible-xml-beers.xml
+
   - name: Compare to expected result
     copy:
       src: results/test-set-children-elements-unicode.xml

tests/integration/targets/xml/tasks/test-set-children-elements.yml

@@ -18,6 +18,9 @@
         - beer: Harvest Pumpkin Ale
     register: set_children_elements
 
+  - name: Add trailing newline
+    shell: echo "" >> /tmp/ansible-xml-beers.xml
+
   - name: Compare to expected result
     copy:
       src: results/test-set-children-elements.xml

tests/integration/targets/xml/tasks/test-set-element-value-empty.yml

@@ -16,6 +16,9 @@
       value: ''
     register: set_element_value_empty
 
+  - name: Add trailing newline
+    shell: echo "" >> /tmp/ansible-xml-beers.xml
+
   - name: Compare to expected result
     copy:
       src: results/test-set-element-value-empty.xml

tests/integration/targets/xml/tasks/test-set-element-value-unicode.yml

@@ -30,6 +30,9 @@
       value: пять
     register: set_element_second_run
 
+  - name: Add trailing newline
+    shell: echo "" >> /tmp/ansible-xml-beers.xml
+
   - name: Compare to expected result
     copy:
       src: results/test-set-element-value-unicode.xml

tests/integration/targets/xml/tasks/test-set-element-value.yml

@@ -30,6 +30,9 @@
       value: '5'
     register: set_element_second_run
 
+  - name: Add trailing newline
+    shell: echo "" >> /tmp/ansible-xml-beers.xml
+
   - name: Compare to expected result
     copy:
       src: results/test-set-element-value.xml

tests/integration/targets/xml/tasks/test-set-namespaced-attribute-value.yml

@@ -22,6 +22,9 @@
       value: 'false'
     register: set_namespaced_attribute_value
 
+  - name: Add trailing newline
+    shell: echo "" >> /tmp/ansible-xml-namespaced-beers.xml
+
   - name: Compare to expected result
     copy:
       src: results/test-set-namespaced-attribute-value.xml

tests/integration/targets/xml/tasks/test-set-namespaced-element-value.yml

@@ -33,6 +33,9 @@
       value: '11'
     register: set_element_second_run
 
+  - name: Add trailing newline
+    shell: echo "" >> /tmp/ansible-xml-namespaced-beers.xml
+
   - name: Compare to expected result
     copy:
       src: results/test-set-namespaced-element-value.xml

tests/unit/plugins/modules/system/interfaces_file/test_interfaces_file.py

@@ -77,6 +77,8 @@ class TestInterfacesFileModule(unittest.TestCase):
     def compareStringWithFile(self, string, path):
         # self.assertEqual("","_",msg=path)
         testfilepath = os.path.join(golden_output_path, path)
+        if string and not string.endswith('\n'):
+            string += '\n'
         goldenstring = string
         if not os.path.isfile(testfilepath):
             f = io.open(testfilepath, 'wb')