summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToshio Kuratomi <a.badger@gmail.com>2016-08-20 10:13:54 -0700
committerGitHub <noreply@github.com>2016-08-20 10:13:54 -0700
commitd29a7c55feb3339089c2da7837b556933c110432 (patch)
tree999cbaf2c80ba5c773685abf98941e9ff409cbf3
parent171a09480592b338425dd99d10e087c2ae37f06e (diff)
downloadansible-d29a7c55feb3339089c2da7837b556933c110432.tar.gz
Enable some basic.py tests on python3 (#17167)
-rw-r--r--test/units/module_utils/basic/test_heuristic_log_sanitize.py1
-rw-r--r--test/units/module_utils/basic/test_no_log.py3
-rw-r--r--test/units/modules/core/test_apt.py1
3 files changed, 0 insertions, 5 deletions
diff --git a/test/units/module_utils/basic/test_heuristic_log_sanitize.py b/test/units/module_utils/basic/test_heuristic_log_sanitize.py
index 14ffff0d74..51a5c11adf 100644
--- a/test/units/module_utils/basic/test_heuristic_log_sanitize.py
+++ b/test/units/module_utils/basic/test_heuristic_log_sanitize.py
@@ -85,7 +85,6 @@ class TestHeuristicLogSanitize(unittest.TestCase):
self.assertTrue(ssh_output.endswith("}"))
self.assertIn(":********@foo.com/data'", ssh_output)
- @unittest.skipIf(sys.version_info[0] >= 3, "Python 3 is not supported on targets (yet)")
def test_hides_parameter_secrets(self):
output = heuristic_log_sanitize('token="secret", user="person", token_entry="test=secret"', frozenset(['secret']))
self.assertNotIn('secret', output)
diff --git a/test/units/module_utils/basic/test_no_log.py b/test/units/module_utils/basic/test_no_log.py
index 102b7a3ab2..3cb5d7b64b 100644
--- a/test/units/module_utils/basic/test_no_log.py
+++ b/test/units/module_utils/basic/test_no_log.py
@@ -50,7 +50,6 @@ class TestReturnValues(unittest.TestCase):
('Toshio くらとみ', frozenset(['Toshio くらとみ'])),
)
- @unittest.skipIf(sys.version_info[0] >= 3, "Python 3 is not supported on targets (yet)")
def test_return_values(self):
for data, expected in self.dataset:
self.assertEquals(frozenset(return_values(data)), expected)
@@ -103,12 +102,10 @@ class TestRemoveValues(unittest.TestCase):
(u'Toshio くらとみ', frozenset(['くらとみ']), u'Toshio ********'),
)
- @unittest.skipIf(sys.version_info[0] >= 3, "Python 3 is not supported on targets (yet)")
def test_no_removal(self):
for value, no_log_strings in self.dataset_no_remove:
self.assertEquals(remove_values(value, no_log_strings), value)
- @unittest.skipIf(sys.version_info[0] >= 3, "Python 3 is not supported on targets (yet)")
def test_strings_to_remove(self):
for value, no_log_strings, expected in self.dataset_remove:
self.assertEquals(remove_values(value, no_log_strings), expected)
diff --git a/test/units/modules/core/test_apt.py b/test/units/modules/core/test_apt.py
index 47e4132797..a5571db1ca 100644
--- a/test/units/modules/core/test_apt.py
+++ b/test/units/modules/core/test_apt.py
@@ -16,7 +16,6 @@ except:
pass
-@unittest.skipIf(sys.version_info[0] >= 3, "Python 3 is not supported on targets (yet)")
class AptExpandPkgspecTestCase(unittest.TestCase):
def setUp(self):