Merge commit '90b0a42a21dc11ca118ffbb679e0871f234c17bc' into develop

* commit '90b0a42a21dc11ca118ffbb679e0871f234c17bc': Unbreak cron.file (saltstack#32396) Unbreak timezone test for Gentoo (saltstack#32420)
gitebra · Apr 7, 2016 · f4ae9bf · f4ae9bf
2 parents 82071cf + 90b0a42
commit f4ae9bf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/salt/states/cron.py b/salt/states/cron.py
@@ -527,6 +527,7 @@ def file(name,
             __env__,
             context,
             defaults,
+            False,        # skip_verify
             **kwargs
         )
     except Exception as exc:
@@ -560,12 +561,12 @@ def file(name,
         ret['comment'] = 'Unable to manage file: {0}'.format(exc)
         return ret
 
+    cron_ret = None
     if ret['changes']:
         cron_ret = __salt__['cron.write_cron_file_verbose'](user, cron_path)
         ret['changes'] = {'diff': ret['changes']['diff']}
         ret['comment'] = 'Crontab for user {0} was updated'.format(user)
     elif ret['result']:
-        cron_ret = None
         ret['comment'] = 'Crontab for user {0} is in the correct ' \
                          'state'.format(user)
 

diff --git a/tests/unit/modules/timezone_test.py b/tests/unit/modules/timezone_test.py
@@ -68,7 +68,7 @@ def test_get_zone(self):
 
                 with patch.dict(timezone.__grains__, {'os_family': 'Gentoo',
                                                       'os': 'Gentoo'}):
-                    self.assertEqual(timezone.get_zone(), '')
+                    self.assertEqual(timezone.get_zone(), '#\nA')
 
             with patch.dict(timezone.__grains__, {'os_family': 'FreeBSD',
                                                   'os': 'FreeBSD'}):