summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Clay <matt@mystile.com>2016-09-02 23:14:44 -0700
committerGitHub <noreply@github.com>2016-09-02 23:14:44 -0700
commit7cd988f60cce0aed24654b8b3e69110487a643ff (patch)
treebb175c3d71a3c5e5e2c085408b1704ebc5873b0b
parentf7b22a5eaa388bc05e97fb649b2bf4f79c463a67 (diff)
downloadansible-7cd988f60cce0aed24654b8b3e69110487a643ff.tar.gz
Enable more integration tests for python 3. (#17375)
The test_async test target was updated to accommodate changes in output buffering behavior in python 3. This change in behavior may need to be addressed in the future.
-rw-r--r--test/integration/Makefile2
-rw-r--r--test/utils/shippable/python3-test-tag-blacklist.txt1
-rw-r--r--test/utils/shippable/python3-test-target-blacklist.txt3
3 files changed, 1 insertions, 5 deletions
diff --git a/test/integration/Makefile b/test/integration/Makefile
index 99fc56a164..b735331037 100644
--- a/test/integration/Makefile
+++ b/test/integration/Makefile
@@ -348,4 +348,4 @@ test_async:
ANSIBLE_DEBUG=0 LC_ALL=bogus ansible-playbook test_async.yml -i localhost, -e ansible_connection=ssh -v $(TEST_FLAGS)
# Verify that the warning exists by examining debug output.
ANSIBLE_DEBUG=1 LC_ALL=bogus ansible-playbook test_async.yml -i localhost, -e ansible_connection=ssh -v $(TEST_FLAGS) \
- | grep -q 'bash: warning: setlocale: LC_ALL: cannot change locale (bogus)'
+ | grep 'bash: warning: setlocale: LC_ALL: cannot change locale (bogus)' > /dev/null
diff --git a/test/utils/shippable/python3-test-tag-blacklist.txt b/test/utils/shippable/python3-test-tag-blacklist.txt
index 967626eb0b..3c1d54cbb7 100644
--- a/test/utils/shippable/python3-test-tag-blacklist.txt
+++ b/test/utils/shippable/python3-test-tag-blacklist.txt
@@ -1,7 +1,6 @@
test_apache2_module
test_apt
test_assemble
-test_async
test_authorized_key
test_filters
test_gem
diff --git a/test/utils/shippable/python3-test-target-blacklist.txt b/test/utils/shippable/python3-test-target-blacklist.txt
index 380e27bad3..3c46962865 100644
--- a/test/utils/shippable/python3-test-target-blacklist.txt
+++ b/test/utils/shippable/python3-test-target-blacklist.txt
@@ -1,4 +1 @@
s/ pull / /
-s/ no_log / /
-s/ test_async_conditional / /
-s/ test_binary_modules$/ /