Commit 225fe855 by Marius Gedminas

Skip test_module_utils_basic_ansible_module_creation on Python 3

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

We're focusing on Python 3 support on the controller first; modules will
come later.
parent 073f10a5
......@@ -1240,10 +1240,7 @@ class AnsibleModule(object):
def _load_params(self):
''' read the input and return a dictionary and the arguments string '''
params = json.loads(MODULE_COMPLEX_ARGS)
if str is bytes:
# Python 2
params = json_dict_unicode_to_bytes(params)
params = json_dict_unicode_to_bytes(json.loads(MODULE_COMPLEX_ARGS))
if params is None:
params = dict()
return params
......
......@@ -21,6 +21,7 @@ from __future__ import (absolute_import, division)
__metaclass__ = type
import errno
import sys
from six.moves import builtins
......@@ -220,7 +221,8 @@ class TestModuleUtilsBasic(unittest.TestCase):
from ansible.module_utils.basic import get_module_path
with patch('os.path.realpath', return_value='/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):
from ansible.module_utils import basic
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment