valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Skip utils_test if timelib is not installed (#32699)

Browse Source 
date_cast() throws a RuntimeError, not an ImportError
This commit is contained in:
Eric Radman 2016-04-20 16:01:21 -04:00 committed by Pablo Suárez Hernández
parent d1d806f893
commit 29814f9d43
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/unit/utils/utils_test.py
View File

@ -527,14 +527,9 @@ class UtilsTestCase(TestCase):
ret = utils.date_cast('Mon Dec 23 10:19:15 MST 2013') ret = utils.date_cast('Mon Dec 23 10:19:15 MST 2013')
expected_ret = datetime.datetime(2013, 12, 23, 10, 19, 15) expected_ret = datetime.datetime(2013, 12, 23, 10, 19, 15)
self.assertEqual(ret, expected_ret) self.assertEqual(ret, expected_ret)
except ImportError: except RuntimeError:
try: # Unparseable without timelib installed
ret = utils.date_cast('Mon Dec 23 10:19:15 MST 2013') self.skipTest('\'timelib\' is not installed')
expected_ret = datetime.datetime(2013, 12, 23, 10, 19, 15)
self.assertEqual(ret, expected_ret)
except RuntimeError:
# Unparseable without timelib installed
self.skipTest('\'timelib\' is not installed')
@skipIf(not HAS_TIMELIB, '\'timelib\' is not installed') @skipIf(not HAS_TIMELIB, '\'timelib\' is not installed')
def test_date_format(self): def test_date_format(self):