7 files changed, 12 insertions, 12 deletions
diff --git a/tests/cloud_tests/testcases/examples/including_user_groups.yaml b/tests/cloud_tests/testcases/examples/including_user_groups.yaml
index 77528d98..86e392dd 100644
--- a/tests/cloud_tests/testcases/examples/including_user_groups.yaml
+++ b/tests/cloud_tests/testcases/examples/including_user_groups.yaml
@@ -18,7 +18,7 @@ cloud_config: |
       gecos: Foo B. Bar
       primary_group: foobar
       groups: users
-      expiredate: 2038-01-19
+      expiredate: '2038-01-19'
       lock_passwd: false
       passwd: $6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/
     - name: barfoo
@@ -28,7 +28,7 @@ cloud_config: |
       lock_passwd: true
     - name: cloudy
       gecos: Magic Cloud App Daemon User
-      inactive: true
+      inactive: '5'
       system: true
 collect_scripts:
   group_ubuntu: |
diff --git a/tests/cloud_tests/testcases/modules/user_groups.yaml b/tests/cloud_tests/testcases/modules/user_groups.yaml
index 675dfb8c..91b0e281 100644
--- a/tests/cloud_tests/testcases/modules/user_groups.yaml
+++ b/tests/cloud_tests/testcases/modules/user_groups.yaml
@@ -17,7 +17,7 @@ cloud_config: |
       gecos: Foo B. Bar
       primary_group: foobar
       groups: users
-      expiredate: 2038-01-19
+      expiredate: '2038-01-19'
       lock_passwd: false
       passwd: $6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/
     - name: barfoo
@@ -27,7 +27,7 @@ cloud_config: |
       lock_passwd: true
     - name: cloudy
       gecos: Magic Cloud App Daemon User
-      inactive: true
+      inactive: '5'
       system: true
 collect_scripts:
   group_ubuntu: |
diff --git a/tests/data/merge_sources/expected10.yaml b/tests/data/merge_sources/expected10.yaml
index b865db16..e9f88f7b 100644
--- a/tests/data/merge_sources/expected10.yaml
+++ b/tests/data/merge_sources/expected10.yaml
@@ -1,7 +1,7 @@
 #cloud-config
 
 power_state:
-  delay: 30
+  delay: '+30'
   mode: poweroff
   message: [Bye, Bye, Pew, Pew]
   
diff --git a/tests/data/merge_sources/expected7.yaml b/tests/data/merge_sources/expected7.yaml
index d32988e8..8186d13a 100644
--- a/tests/data/merge_sources/expected7.yaml
+++ b/tests/data/merge_sources/expected7.yaml
@@ -7,7 +7,7 @@ users:
     primary_group: foobar
     groups: users
     selinux_user: staff_u
-    expiredate: 2012-09-01
+    expiredate: '2012-09-01'
     ssh_import_id: foobar
     lock-passwd: false
     passwd: $6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/
@@ -22,7 +22,7 @@ users:
       - <ssh pub key 2>
   - name: cloudy
     gecos: Magic Cloud App Daemon User
-    inactive: true
+    inactive: '5'
     system: true
   - bob
   - joe
@@ -32,7 +32,7 @@ users:
     primary_group: foobar
     groups: users
     selinux_user: staff_u
-    expiredate: 2012-09-01
+    expiredate: '2012-09-01'
     ssh_import_id: foobar
     lock-passwd: false
     passwd: $6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/
diff --git a/tests/data/merge_sources/source10-1.yaml b/tests/data/merge_sources/source10-1.yaml
index 6ae72a13..36fd336d 100644
--- a/tests/data/merge_sources/source10-1.yaml
+++ b/tests/data/merge_sources/source10-1.yaml
@@ -1,6 +1,6 @@
 #cloud-config
 
 power_state:
- delay: 30
+ delay: '+30'
  mode: poweroff
  message: [Bye, Bye]
diff --git a/tests/data/merge_sources/source7-1.yaml b/tests/data/merge_sources/source7-1.yaml
index 6405fc9b..ec93079f 100644
--- a/tests/data/merge_sources/source7-1.yaml
+++ b/tests/data/merge_sources/source7-1.yaml
@@ -7,7 +7,7 @@ users:
     primary_group: foobar
     groups: users
     selinux_user: staff_u
-    expiredate: 2012-09-01
+    expiredate: '2012-09-01'
     ssh_import_id: foobar
     lock-passwd: false
     passwd: $6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/
@@ -22,6 +22,6 @@ users:
       - <ssh pub key 2>
   - name: cloudy
     gecos: Magic Cloud App Daemon User
-    inactive: true
+    inactive: '5'
     system: true
 
diff --git a/tests/data/merge_sources/source7-2.yaml b/tests/data/merge_sources/source7-2.yaml
index 0cd28978..0c02abff 100644
--- a/tests/data/merge_sources/source7-2.yaml
+++ b/tests/data/merge_sources/source7-2.yaml
@@ -9,7 +9,7 @@ users:
     primary_group: foobar
     groups: users
     selinux_user: staff_u
-    expiredate: 2012-09-01
+    expiredate: '2012-09-01'
     ssh_import_id: foobar
     lock-passwd: false
     passwd: $6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/