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

Py3 compatibility fixes

Browse Source
This commit is contained in:
Pedro Algarvio 2014-11-22 11:41:55 +00:00
parent f13718f11c
commit 5242e7217a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/unit/modules/shadow_test.py
View File

@ -10,6 +10,7 @@ from __future__ import absolute_import
from salt.utils import is_linux from salt.utils import is_linux
from salttesting import TestCase, skipIf from salttesting import TestCase, skipIf
from salttesting.helpers import ensure_in_syspath from salttesting.helpers import ensure_in_syspath
ensure_in_syspath('../../')
# Import salt libs # Import salt libs
try: try:
@ -18,7 +19,9 @@ try:
except ImportError: except ImportError:
HAS_SHADOW = False HAS_SHADOW = False
ensure_in_syspath('../../') # Import 3rd-party libs
import salt.ext.six as six
_PASSWORD = 'lamepassword' _PASSWORD = 'lamepassword'
@ -47,7 +50,7 @@ class LinuxShadowTest(TestCase):
Test shadow.gen_password Test shadow.gen_password
''' '''
self.assertTrue(HAS_SHADOW) self.assertTrue(HAS_SHADOW)
for algorithm, hash_info in _HASHES.iteritems(): for algorithm, hash_info in six.iteritems(_HASHES):
self.assertEqual( self.assertEqual(
shadow.gen_password( shadow.gen_password(
_PASSWORD, _PASSWORD,