ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-05-22 17:09:08 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

refactor moudule utils of hwc_utils.py (#55858)

Browse source 
* use navigate_value instead navigate_hash

* add async wait method

* update dict compare

* remove unuse methods

* not all modules have timeouts parameter

* navigate_value, the input data may be None
This commit is contained in:
zengchen 2019-05-09 21:04:52 +08:00 • committed by jctanner
parent 34a8594c91
commit d8314e1a45
6 changed files with 305 additions and 327 deletions
Download patch file Download diff file Expand all files Collapse all files

60
test/units/module_utils/hwc/test_dict_comparison.py
View file

@ -21,7 +21,7 @@ import os
import sys
from units.compat import unittest
from ansible.module_utils.hwc_utils import DictComparison
from ansible.module_utils.hwc_utils import are_different_dicts
class HwcDictComparisonTestCase(unittest.TestCase):
@ -30,9 +30,8 @@ class HwcDictComparisonTestCase(unittest.TestCase):
'foo': 'bar',
'test': 'original'
}
d = DictComparison(value1)
d_ = d
self.assertTrue(d == d_)
self.assertFalse(are_different_dicts(value1, value1))
def test_simple_different(self):
value1 = {
@ -46,12 +45,10 @@ class HwcDictComparisonTestCase(unittest.TestCase):
value3 = {
'test': 'original'
}
dict1 = DictComparison(value1)
dict2 = DictComparison(value2)
dict3 = DictComparison(value3)
self.assertFalse(dict1 == dict2)
self.assertFalse(dict1 == dict3)
self.assertFalse(dict2 == dict3)
self.assertTrue(are_different_dicts(value1, value2))
self.assertTrue(are_different_dicts(value1, value3))
self.assertTrue(are_different_dicts(value2, value3))
def test_nested_dictionaries_no_difference(self):
value1 = {
@ -63,9 +60,8 @@ class HwcDictComparisonTestCase(unittest.TestCase):
},
'test': 'original'
}
d = DictComparison(value1)
d_ = d
self.assertTrue(d == d_)
self.assertFalse(are_different_dicts(value1, value1))
def test_nested_dictionaries_with_difference(self):
value1 = {
@ -95,12 +91,9 @@ class HwcDictComparisonTestCase(unittest.TestCase):
}
}
dict1 = DictComparison(value1)
dict2 = DictComparison(value2)
dict3 = DictComparison(value3)
self.assertFalse(dict1 == dict2)
self.assertFalse(dict1 == dict3)
self.assertFalse(dict2 == dict3)
self.assertTrue(are_different_dicts(value1, value2))
self.assertTrue(are_different_dicts(value1, value3))
self.assertTrue(are_different_dicts(value2, value3))
def test_arrays_strings_no_difference(self):
value1 = {
@ -109,9 +102,8 @@ class HwcDictComparisonTestCase(unittest.TestCase):
'bar'
]
}
d = DictComparison(value1)
d_ = d
self.assertTrue(d == d_)
self.assertFalse(are_different_dicts(value1, value1))
def test_arrays_strings_with_difference(self):
value1 = {
@ -133,12 +125,9 @@ class HwcDictComparisonTestCase(unittest.TestCase):
]
}
dict1 = DictComparison(value1)
dict2 = DictComparison(value2)
dict3 = DictComparison(value3)
self.assertFalse(dict1 == dict2)
self.assertFalse(dict1 == dict3)
self.assertFalse(dict2 == dict3)
self.assertTrue(are_different_dicts(value1, value2))
self.assertTrue(are_different_dicts(value1, value3))
self.assertTrue(are_different_dicts(value2, value3))
def test_arrays_dicts_with_no_difference(self):
value1 = {
@ -152,9 +141,8 @@ class HwcDictComparisonTestCase(unittest.TestCase):
}
]
}
d = DictComparison(value1)
d_ = d
self.assertTrue(d == d_)
self.assertFalse(are_different_dicts(value1, value1))
def test_arrays_dicts_with_difference(self):
value1 = {
@ -184,9 +172,7 @@ class HwcDictComparisonTestCase(unittest.TestCase):
}
]
}
dict1 = DictComparison(value1)
dict2 = DictComparison(value2)
dict3 = DictComparison(value3)
self.assertFalse(dict1 == dict2)
self.assertFalse(dict1 == dict3)
self.assertFalse(dict2 == dict3)
self.assertTrue(are_different_dicts(value1, value2))
self.assertTrue(are_different_dicts(value1, value3))
self.assertTrue(are_different_dicts(value2, value3))

109
test/units/module_utils/hwc/test_hwc_utils.py
View file

@ -1,109 +1,34 @@
# -*- coding: utf-8 -*-
import os
import sys
from units.compat import unittest
from ansible.module_utils.hwc_utils import (navigate_hash,
remove_empty_from_dict,
remove_nones_from_dict,
replace_resource_dict)
from ansible.module_utils.hwc_utils import (HwcModuleException, navigate_value)
class HwcUtilsTestCase(unittest.TestCase):
def test_navigate_hash(self):
def test_navigate_value(self):
value = {
'foo': {
'quiet': {
'tree': 'test'
'tree': 'test',
"trees": [0, 1]
},
}
}
self.assertEquals(navigate_hash(value, ["foo", "quiet", "tree"]),
self.assertEquals(navigate_value(value, ["foo", "quiet", "tree"]),
"test")
self.assertEquals(navigate_hash(value, ["foo", "q", "tree"], 123),
123)
self.assertEquals(
navigate_value(value, ["foo", "quiet", "trees"],
{"foo.quiet.trees": 1}),
1)
self.assertIsNone(navigate_hash(value, [], 123))
self.assertRaisesRegexp(HwcModuleException,
r".* key\(q\) is not exist in dict",
navigate_value, value, ["foo", "q", "tree"])
def test_remove_empty_from_dict(self):
value = {
'foo': {
'quiet': {
'tree': 'test',
'tree1': [
None,
{},
[],
'test'
],
'tree2': {},
'tree3': []
},
},
'foo1': [],
'foo2': {},
'foo3': None,
}
expect = {
'foo': {
'quiet': {
'tree': 'test',
'tree1': [
'test'
]
},
},
}
self.assertEqual(remove_empty_from_dict(value), expect)
def test_remove_nones_from_dict(self):
value = {
'foo': {
'quiet': {
'tree': 'test',
'tree1': [
None,
{},
[],
'test'
],
'tree2': {},
'tree3': []
},
},
'foo1': [],
'foo2': {},
'foo3': None,
}
expect = {
'foo': {
'quiet': {
'tree': 'test',
'tree1': [
{},
[],
'test'
],
'tree2': {},
'tree3': []
},
},
'foo1': [],
'foo2': {},
}
self.assertEqual(remove_nones_from_dict(value), expect)
def test_replace_resource_dict(self):
self.assertEqual(replace_resource_dict({'foo': 'quiet'}, 'foo'), 'quiet')
self.assertEqual(replace_resource_dict({}, 'foo'), {})
self.assertEqual(replace_resource_dict([[{'foo': 'quiet'}]], 'foo'),
[['quiet']])
self.assertRaisesRegexp(HwcModuleException,
r".* the index is out of list",
navigate_value, value,
["foo", "quiet", "trees"],
{"foo.quiet.trees": 2})