1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Skip test_module_utils_basic_ansible_module_creation on Python 3

This reverts commit 073f10a52a and instead
disables the failing test.

We're focusing on Python 3 support on the controller first; modules will
come later.
This commit is contained in:
Marius Gedminas 2015-10-14 09:32:26 +03:00
parent 073f10a52a
commit 225fe85530
2 changed files with 4 additions and 5 deletions

View file

@ -1240,10 +1240,7 @@ class AnsibleModule(object):
def _load_params(self): def _load_params(self):
''' read the input and return a dictionary and the arguments string ''' ''' read the input and return a dictionary and the arguments string '''
params = json.loads(MODULE_COMPLEX_ARGS) params = json_dict_unicode_to_bytes(json.loads(MODULE_COMPLEX_ARGS))
if str is bytes:
# Python 2
params = json_dict_unicode_to_bytes(params)
if params is None: if params is None:
params = dict() params = dict()
return params return params

View file

@ -21,6 +21,7 @@ from __future__ import (absolute_import, division)
__metaclass__ = type __metaclass__ = type
import errno import errno
import sys
from six.moves import builtins from six.moves import builtins
@ -220,7 +221,8 @@ class TestModuleUtilsBasic(unittest.TestCase):
from ansible.module_utils.basic import get_module_path from ansible.module_utils.basic import get_module_path
with patch('os.path.realpath', return_value='/path/to/foo/'): with patch('os.path.realpath', return_value='/path/to/foo/'):
self.assertEqual(get_module_path(), '/path/to/foo') self.assertEqual(get_module_path(), '/path/to/foo')
@unittest.skipIf(sys.version_info[0] >= 3, "Python 3 is not supported on targets (yet)")
def test_module_utils_basic_ansible_module_creation(self): def test_module_utils_basic_ansible_module_creation(self):
from ansible.module_utils import basic from ansible.module_utils import basic