mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Ported tesT_listdiff.py from unittest to pytest and additional code-coverage tests
This commit is contained in:
David Murphy
Pedro Algarvio
parent
94a74fc3f3
commit
42a2149621
2 changed files with 186 additions and 109 deletions
186
tests/pytests/unit/utils/test_listdiffer.py
Normal file
186
tests/pytests/unit/utils/test_listdiffer.py
Normal file
|
|
@ -0,0 +1,186 @@
|
|||
import pytest
|
||||
|
||||
from salt.utils import dictdiffer
|
||||
from salt.utils.listdiffer import list_diff
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def get_NONE_value():
|
||||
return dictdiffer.RecursiveDictDiffer.NONE_VALUE
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def get_old_list():
|
||||
return [
|
||||
{"key": 1, "value": "foo1", "int_value": 101},
|
||||
{"key": 2, "value": "foo2", "int_value": 102},
|
||||
{"key": 3, "value": "foo3", "int_value": 103},
|
||||
]
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def get_new_list():
|
||||
return [
|
||||
{"key": 1, "value": "foo1", "int_value": 101},
|
||||
{"key": 2, "value": "foo2", "int_value": 112},
|
||||
{"key": 5, "value": "foo5", "int_value": 105},
|
||||
]
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def test_list_diff(get_old_list, get_new_list):
|
||||
test_list_diff = list_diff(get_old_list, get_new_list, key="key")
|
||||
return test_list_diff
|
||||
|
||||
|
||||
def test_added(test_list_diff):
|
||||
assert len(test_list_diff.added) == 1
|
||||
assert test_list_diff.added[0] == {"key": 5, "value": "foo5", "int_value": 105}
|
||||
|
||||
|
||||
def test_removed(test_list_diff):
|
||||
assert len(test_list_diff.removed) == 1
|
||||
assert test_list_diff.removed[0] == {"key": 3, "value": "foo3", "int_value": 103}
|
||||
|
||||
|
||||
def test_diffs(test_list_diff, get_NONE_value):
|
||||
assert len(test_list_diff.diffs) == 3
|
||||
assert test_list_diff.diffs[0] == {2: {"int_value": {"new": 112, "old": 102}}}
|
||||
|
||||
# Added items
|
||||
assert test_list_diff.diffs[1] == {
|
||||
5: {
|
||||
"int_value": {"new": 105, "old": get_NONE_value},
|
||||
"key": {"new": 5, "old": get_NONE_value},
|
||||
"value": {"new": "foo5", "old": get_NONE_value},
|
||||
}
|
||||
}
|
||||
|
||||
# Removed items
|
||||
assert test_list_diff.diffs[2] == {
|
||||
3: {
|
||||
"int_value": {"new": get_NONE_value, "old": 103},
|
||||
"key": {"new": get_NONE_value, "old": 3},
|
||||
"value": {"new": get_NONE_value, "old": "foo3"},
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
def test_new_values(test_list_diff):
|
||||
assert len(test_list_diff.new_values) == 2
|
||||
assert test_list_diff.new_values[0] == {"key": 2, "int_value": 112}
|
||||
assert test_list_diff.new_values[1] == {"key": 5, "value": "foo5", "int_value": 105}
|
||||
|
||||
|
||||
def test_old_values(test_list_diff):
|
||||
assert len(test_list_diff.old_values) == 2
|
||||
assert test_list_diff.old_values[0] == {"key": 2, "int_value": 102}
|
||||
assert test_list_diff.old_values[1] == {"key": 3, "value": "foo3", "int_value": 103}
|
||||
|
||||
|
||||
def test_changed_all(test_list_diff):
|
||||
assert test_list_diff.changed(selection="all") == [
|
||||
"key.2.int_value",
|
||||
"key.5.int_value",
|
||||
"key.5.value",
|
||||
"key.3.int_value",
|
||||
"key.3.value",
|
||||
]
|
||||
|
||||
|
||||
def test_changed_intersect(test_list_diff):
|
||||
assert test_list_diff.changed(selection="intersect") == ["key.2.int_value"]
|
||||
|
||||
|
||||
def test_changes_str(test_list_diff):
|
||||
expected = """\tidentified by key 2:
|
||||
\tint_value from 102 to 112
|
||||
\tidentified by key 3:
|
||||
\twill be removed
|
||||
\tidentified by key 5:
|
||||
\twill be added
|
||||
"""
|
||||
assert test_list_diff.changes_str == expected
|
||||
|
||||
|
||||
def test_intersect(test_list_diff):
|
||||
expected = [
|
||||
{
|
||||
"key": 1,
|
||||
"old": {"key": 1, "value": "foo1", "int_value": 101},
|
||||
"new": {"key": 1, "value": "foo1", "int_value": 101},
|
||||
},
|
||||
{
|
||||
"key": 2,
|
||||
"old": {"key": 2, "value": "foo2", "int_value": 102},
|
||||
"new": {"key": 2, "value": "foo2", "int_value": 112},
|
||||
},
|
||||
]
|
||||
test_isect = test_list_diff.intersect
|
||||
assert test_isect == expected
|
||||
|
||||
|
||||
def test_remove_diff_intersect(test_list_diff):
|
||||
expected = [
|
||||
{
|
||||
"key": 1,
|
||||
"old": {"key": 1, "int_value": 101},
|
||||
"new": {"key": 1, "int_value": 101},
|
||||
},
|
||||
{
|
||||
"key": 2,
|
||||
"old": {"key": 2, "int_value": 102},
|
||||
"new": {"key": 2, "int_value": 112},
|
||||
},
|
||||
]
|
||||
|
||||
test_list_diff.remove_diff(diff_key="value")
|
||||
test_isect = test_list_diff.intersect
|
||||
assert test_isect == expected
|
||||
|
||||
|
||||
def test_remove_diff_removed(test_list_diff):
|
||||
expected = [
|
||||
{
|
||||
"key": 1,
|
||||
"old": {"key": 1, "value": "foo1", "int_value": 101},
|
||||
"new": {"key": 1, "value": "foo1", "int_value": 101},
|
||||
},
|
||||
{
|
||||
"key": 2,
|
||||
"old": {"key": 2, "value": "foo2", "int_value": 102},
|
||||
"new": {"key": 2, "value": "foo2", "int_value": 112},
|
||||
},
|
||||
]
|
||||
test_list_diff.remove_diff(diff_key="value", diff_list="removed")
|
||||
test_isect = test_list_diff.intersect
|
||||
assert test_isect == expected
|
||||
|
||||
|
||||
def test_changes_str2(test_list_diff):
|
||||
expected = """ key=2 (updated):
|
||||
int_value from 102 to 112
|
||||
key=3 (removed)
|
||||
key=5 (added): {'key': 5, 'value': 'foo5', 'int_value': 105}"""
|
||||
test_changes = test_list_diff.changes_str2
|
||||
assert test_changes == expected
|
||||
|
||||
|
||||
def test_current_list(test_list_diff):
|
||||
expected = [
|
||||
{"key": 1, "value": "foo1", "int_value": 101},
|
||||
{"key": 2, "value": "foo2", "int_value": 102},
|
||||
{"key": 3, "value": "foo3", "int_value": 103},
|
||||
]
|
||||
test_curr_list = test_list_diff.current_list
|
||||
assert test_curr_list == expected
|
||||
|
||||
|
||||
def test_new_list(test_list_diff):
|
||||
expected = [
|
||||
{"key": 1, "value": "foo1", "int_value": 101},
|
||||
{"key": 2, "value": "foo2", "int_value": 112},
|
||||
{"key": 5, "value": "foo5", "int_value": 105},
|
||||
]
|
||||
test_new_list = test_list_diff.new_list
|
||||
assert test_new_list == expected
|
||||
|
|
@ -1,109 +0,0 @@
|
|||
from salt.utils import dictdiffer
|
||||
from salt.utils.listdiffer import list_diff
|
||||
from tests.support.unit import TestCase
|
||||
|
||||
NONE = dictdiffer.RecursiveDictDiffer.NONE_VALUE
|
||||
|
||||
|
||||
class ListDictDifferTestCase(TestCase):
|
||||
def setUp(self):
|
||||
old_list = [
|
||||
{"key": 1, "value": "foo1", "int_value": 101},
|
||||
{"key": 2, "value": "foo2", "int_value": 102},
|
||||
{"key": 3, "value": "foo3", "int_value": 103},
|
||||
]
|
||||
new_list = [
|
||||
{"key": 1, "value": "foo1", "int_value": 101},
|
||||
{"key": 2, "value": "foo2", "int_value": 112},
|
||||
{"key": 5, "value": "foo5", "int_value": 105},
|
||||
]
|
||||
self.list_diff = list_diff(old_list, new_list, key="key")
|
||||
|
||||
def tearDown(self):
|
||||
for attrname in ("list_diff",):
|
||||
try:
|
||||
delattr(self, attrname)
|
||||
except AttributeError:
|
||||
continue
|
||||
|
||||
def test_added(self):
|
||||
self.assertEqual(len(self.list_diff.added), 1)
|
||||
self.assertDictEqual(
|
||||
self.list_diff.added[0], {"key": 5, "value": "foo5", "int_value": 105}
|
||||
)
|
||||
|
||||
def test_removed(self):
|
||||
self.assertEqual(len(self.list_diff.removed), 1)
|
||||
self.assertDictEqual(
|
||||
self.list_diff.removed[0], {"key": 3, "value": "foo3", "int_value": 103}
|
||||
)
|
||||
|
||||
def test_diffs(self):
|
||||
self.assertEqual(len(self.list_diff.diffs), 3)
|
||||
self.assertDictEqual(
|
||||
self.list_diff.diffs[0], {2: {"int_value": {"new": 112, "old": 102}}}
|
||||
)
|
||||
self.assertDictEqual(
|
||||
self.list_diff.diffs[1],
|
||||
# Added items
|
||||
{
|
||||
5: {
|
||||
"int_value": {"new": 105, "old": NONE},
|
||||
"key": {"new": 5, "old": NONE},
|
||||
"value": {"new": "foo5", "old": NONE},
|
||||
}
|
||||
},
|
||||
)
|
||||
self.assertDictEqual(
|
||||
self.list_diff.diffs[2],
|
||||
# Removed items
|
||||
{
|
||||
3: {
|
||||
"int_value": {"new": NONE, "old": 103},
|
||||
"key": {"new": NONE, "old": 3},
|
||||
"value": {"new": NONE, "old": "foo3"},
|
||||
}
|
||||
},
|
||||
)
|
||||
|
||||
def test_new_values(self):
|
||||
self.assertEqual(len(self.list_diff.new_values), 2)
|
||||
self.assertDictEqual(self.list_diff.new_values[0], {"key": 2, "int_value": 112})
|
||||
self.assertDictEqual(
|
||||
self.list_diff.new_values[1], {"key": 5, "value": "foo5", "int_value": 105}
|
||||
)
|
||||
|
||||
def test_old_values(self):
|
||||
self.assertEqual(len(self.list_diff.old_values), 2)
|
||||
self.assertDictEqual(self.list_diff.old_values[0], {"key": 2, "int_value": 102})
|
||||
self.assertDictEqual(
|
||||
self.list_diff.old_values[1], {"key": 3, "value": "foo3", "int_value": 103}
|
||||
)
|
||||
|
||||
def test_changed_all(self):
|
||||
self.assertEqual(
|
||||
self.list_diff.changed(selection="all"),
|
||||
[
|
||||
"key.2.int_value",
|
||||
"key.5.int_value",
|
||||
"key.5.value",
|
||||
"key.3.int_value",
|
||||
"key.3.value",
|
||||
],
|
||||
)
|
||||
|
||||
def test_changed_intersect(self):
|
||||
self.assertEqual(
|
||||
self.list_diff.changed(selection="intersect"), ["key.2.int_value"]
|
||||
)
|
||||
|
||||
def test_changes_str(self):
|
||||
self.assertEqual(
|
||||
self.list_diff.changes_str,
|
||||
"\tidentified by key 2:\n"
|
||||
"\tint_value from 102 to 112\n"
|
||||
"\tidentified by key 3:\n"
|
||||
"\twill be removed\n"
|
||||
"\tidentified by key 5:\n"
|
||||
"\twill be added\n",
|
||||
)
|
||||
Loading…
Add table
Reference in a new issue