summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJiri Tyr <jtyr@users.noreply.github.com>2019-02-28 20:09:30 +0100
committerSam Doran <sdoran@redhat.com>2019-02-28 20:09:30 +0100
commit7739b5e96c3294fedcc2bf9cf695b7e51e072e62 (patch)
treebe1827c8586eeced6427d38265bf5c06b406fc49 /test
parentDocumentation update for labels operations on swarm/node (#53083) (diff)
downloadansible-7739b5e96c3294fedcc2bf9cf695b7e51e072e62.tar.xz
ansible-7739b5e96c3294fedcc2bf9cf695b7e51e072e62.zip
Last two fields in fstab are optional (fixes #43855) (#43941)
* Last two fields in fstab are optional * Add changelog
Diffstat (limited to 'test')
-rw-r--r--test/integration/targets/mount/tasks/main.yml32
1 files changed, 30 insertions, 2 deletions
diff --git a/test/integration/targets/mount/tasks/main.yml b/test/integration/targets/mount/tasks/main.yml
index 6fdff8aac5..e8b7fdfbf8 100644
--- a/test/integration/targets/mount/tasks/main.yml
+++ b/test/integration/targets/mount/tasks/main.yml
@@ -119,8 +119,6 @@
shell: mount | grep mount_dest | grep -E -w '(ro|read-only)' | wc -l
register: remount_options
-- debug: var=remount_options
-
- name: Make sure the filesystem now has the new opts
assert:
that:
@@ -248,3 +246,33 @@
- "swap2_removed['changed']"
- "not swap2_removed_again['changed']"
when: ansible_system in ('Linux')
+
+- name: Create fstab record with missing last two fields
+ copy:
+ dest: /etc/fstab
+ content: |
+ //nas/photo /home/jik/pictures cifs defaults,credentials=/etc/security/nas.creds,uid=jik,gid=users,forceuid,forcegid,noserverino,_netdev
+ when: ansible_system in ('Linux')
+
+- name: Try to change the fstab record with the missing last two fields
+ mount:
+ src: //nas/photo
+ path: /home/jik/pictures
+ fstype: cifs
+ opts: defaults,credentials=/etc/security/nas.creds,uid=jik,gid=users,forceuid,forcegid,noserverino,_netdev,x-systemd.mount-timeout=0
+ state: present
+ register: optional_fields_update
+ when: ansible_system in ('Linux')
+
+- name: Get the content of the fstab file
+ shell: cat /etc/fstab
+ register: optional_fields_content
+ when: ansible_system in ('Linux')
+
+- name: Check if the line containing the missing last two fields was changed
+ assert:
+ that:
+ - "optional_fields_update['changed']"
+ - "' 0 0' in optional_fields_content.stdout"
+ - "1 == optional_fields_content.stdout_lines | length"
+ when: ansible_system in ('Linux')