From 8eab6a43f73fb21e1d4c4c15dc714e0d2cb81e13 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Sat, 9 Sep 2017 16:17:38 -0700 Subject: [PATCH] Fix set theory filters for python3 The set theory filters need to use lists rather than generators on python3. Also add unit tests for most of the mathstuff filters Fixes #26494 (cherry picked from commit 75249e311e551608c1f811b51e46fd9b5668d3eb) --- lib/ansible/plugins/filter/mathstuff.py | 8 +- test/units/plugins/filter/test_mathstuff.py | 122 ++++++++++++++++++++ 2 files changed, 126 insertions(+), 4 deletions(-) create mode 100644 test/units/plugins/filter/test_mathstuff.py diff --git a/lib/ansible/plugins/filter/mathstuff.py b/lib/ansible/plugins/filter/mathstuff.py index e498abc54e7..9bbc689199f 100644 --- a/lib/ansible/plugins/filter/mathstuff.py +++ b/lib/ansible/plugins/filter/mathstuff.py @@ -44,7 +44,7 @@ def intersect(a, b): if isinstance(a, collections.Hashable) and isinstance(b, collections.Hashable): c = set(a) & set(b) else: - c = unique(filter(lambda x: x in b, a)) + c = unique([x for x in a if x in b]) return c @@ -52,7 +52,7 @@ def difference(a, b): if isinstance(a, collections.Hashable) and isinstance(b, collections.Hashable): c = set(a) - set(b) else: - c = unique(filter(lambda x: x not in b, a)) + c = unique([x for x in a if x not in b]) return c @@ -60,7 +60,7 @@ def symmetric_difference(a, b): if isinstance(a, collections.Hashable) and isinstance(b, collections.Hashable): c = set(a) ^ set(b) else: - c = unique(filter(lambda x: x not in intersect(a, b), union(a, b))) + c = unique([x for x in union(a, b) if x not in intersect(a, b)]) return c @@ -105,7 +105,7 @@ def inversepower(x, base=2): return math.sqrt(x) else: return math.pow(x, 1.0 / float(base)) - except TypeError as e: + except (ValueError, TypeError) as e: raise errors.AnsibleFilterError('root() can only be used on numbers: %s' % str(e)) diff --git a/test/units/plugins/filter/test_mathstuff.py b/test/units/plugins/filter/test_mathstuff.py new file mode 100644 index 00000000000..c3c472938bd --- /dev/null +++ b/test/units/plugins/filter/test_mathstuff.py @@ -0,0 +1,122 @@ +# Copyright: (c) 2017, Ansible Project +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) + +# Make coding more python3-ish +from __future__ import (absolute_import, division, print_function) +__metaclass__ = type + +import pytest + +import ansible.plugins.filter.mathstuff as ms +from ansible.errors import AnsibleFilterError + + +UNIQUE_DATA = (([1, 3, 4, 2], sorted([1, 2, 3, 4])), + ([1, 3, 2, 4, 2, 3], sorted([1, 2, 3, 4])), + (['a', 'b', 'c', 'd'], sorted(['a', 'b', 'c', 'd'])), + (['a', 'a', 'd', 'b', 'a', 'd', 'c', 'b'], sorted(['a', 'b', 'c', 'd'])), + ) + +TWO_SETS_DATA = (([1, 2], [3, 4], ([], sorted([1, 2]), sorted([1, 2, 3, 4]), sorted([1, 2, 3, 4]))), + ([1, 2, 3], [5, 3, 4], ([3], sorted([1, 2]), sorted([1, 2, 5, 4]), sorted([1, 2, 3, 4, 5]))), + (['a', 'b', 'c'], ['d', 'c', 'e'], (['c'], sorted(['a', 'b']), sorted(['a', 'b', 'd', 'e']), sorted(['a', 'b', 'c', 'e', 'd']))), + ) + + +@pytest.mark.parametrize('data, expected', UNIQUE_DATA) +class TestUnique: + def test_unhashable(self, data, expected): + assert sorted(ms.unique(list(data))) == expected + + def test_hashable(self, data, expected): + assert sorted(ms.unique(tuple(data))) == expected + + +@pytest.mark.parametrize('dataset1, dataset2, expected', TWO_SETS_DATA) +class TestIntersect: + def test_unhashable(self, dataset1, dataset2, expected): + assert sorted(ms.intersect(list(dataset1), list(dataset2))) == expected[0] + + def test_hashable(self, dataset1, dataset2, expected): + assert sorted(ms.intersect(tuple(dataset1), tuple(dataset2))) == expected[0] + + +@pytest.mark.parametrize('dataset1, dataset2, expected', TWO_SETS_DATA) +class TestDifference: + def test_unhashable(self, dataset1, dataset2, expected): + assert sorted(ms.difference(list(dataset1), list(dataset2))) == expected[1] + + def test_hashable(self, dataset1, dataset2, expected): + assert sorted(ms.difference(tuple(dataset1), tuple(dataset2))) == expected[1] + + +@pytest.mark.parametrize('dataset1, dataset2, expected', TWO_SETS_DATA) +class TestSymmetricDifference: + def test_unhashable(self, dataset1, dataset2, expected): + assert sorted(ms.symmetric_difference(list(dataset1), list(dataset2))) == expected[2] + + def test_hashable(self, dataset1, dataset2, expected): + assert sorted(ms.symmetric_difference(tuple(dataset1), tuple(dataset2))) == expected[2] + + +class TestMin: + def test_min(self): + assert ms.min((1, 2)) == 1 + assert ms.min((2, 1)) == 1 + assert ms.min(('p', 'a', 'w', 'b', 'p')) == 'a' + + +class TestMax: + def test_max(self): + assert ms.max((1, 2)) == 2 + assert ms.max((2, 1)) == 2 + assert ms.max(('p', 'a', 'w', 'b', 'p')) == 'w' + + +class TestLogarithm: + def test_log_non_number(self): + with pytest.raises(AnsibleFilterError, message='log() can only be used on numbers: a float is required'): + ms.logarithm('a') + with pytest.raises(AnsibleFilterError, message='log() can only be used on numbers: a float is required'): + ms.logarithm(10, base='a') + + def test_log_ten(self): + assert ms.logarithm(10, 10) == 1.0 + assert ms.logarithm(69, 10) * 1000 // 1 == 1838 + + def test_log_natural(self): + assert ms.logarithm(69) * 1000 // 1 == 4234 + + def test_log_two(self): + assert ms.logarithm(69, 2) * 1000 // 1 == 6108 + + +class TestPower: + def test_power_non_number(self): + with pytest.raises(AnsibleFilterError, message='pow() can only be used on numbers: a float is required'): + ms.power('a', 10) + + with pytest.raises(AnsibleFilterError, message='pow() can only be used on numbers: a float is required'): + ms.power(10, 'a') + + def test_power_squared(self): + assert ms.power(10, 2) == 100 + + def test_power_cubed(self): + assert ms.power(10, 3) == 1000 + + +class TestInversePower: + def test_root_non_number(self): + with pytest.raises(AnsibleFilterError, message='root() can only be used on numbers: a float is required'): + ms.inversepower(10, 'a') + + with pytest.raises(AnsibleFilterError, message='root() can only be used on numbers: a float is required'): + ms.inversepower('a', 10) + + def test_square_root(self): + assert ms.inversepower(100) == 10 + assert ms.inversepower(100, 2) == 10 + + def test_cube_root(self): + assert ms.inversepower(27, 3) == 3