Reorganizing tox stuff and making py3-specific requirements

test/utils/run_tests.sh

@@ -1,4 +1,4 @@
-#!/bin/sh -xe
+#!/bin/sh -x
 
 if [ "${TARGET}" = "sanity" ]; then
     ./test/code-smell/replace-urlopen.sh .
@@ -8,6 +8,7 @@ if [ "${TARGET}" = "sanity" ]; then
     if test x"$TOXENV" != x'py24' ; then tox ; fi
     if test x"$TOXENV" = x'py24' ; then python2.4 -V && python2.4 -m compileall -fq -x 'module_utils/(a10|rax|openstack|ec2|gce).py' lib/ansible/module_utils ; fi
 else
+    set -e
     export C_NAME="testAbull_$$_$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1)"
     docker run -d --volume="${PWD}:/root/ansible"  --name "${C_NAME}" ${TARGET_OPTIONS} ansible/ansible:${TARGET} > /tmp/cid_${TARGET}
     docker exec -ti $(cat /tmp/cid_${TARGET}) /bin/sh -c "export TEST_FLAGS='${TEST_FLAGS}'; cd /root/ansible; . hacking/env-setup; (cd test/integration; LC_ALL=en_US.utf-8 make)"

test/utils/tox/requirements-py3.txt

@@ -0,0 +1,13 @@
+#
+# Test requirements
+#
+
+nose
+mock >= 1.0.1, < 1.1
+passlib
+coverage
+coveralls
+unittest2
+redis
+python3-memcached
+python-systemd

tox.ini

@@ -1,8 +1,14 @@
 [tox]
 envlist = py26,py27,py34,py35
 
+[testenv:py34]
+deps = -r{toxinidir}/test/utils/tox/requirements-py3.txt
+
+[testenv:py35]
+deps = -r{toxinidir}/test/utils/tox/requirements-py3.txt
+
 [testenv]
-deps = -r{toxinidir}/test-requirements.txt
+deps = -r{toxinidir}/test/utils/tox/requirements.txt
 whitelist_externals = make
 commands =
     python --version