Fix tests on python 2.6 and mark as deprecated

Pin mock to < 1.1 as newer versions no longer work on python 2.6.
Remove duplicate unittest2 for python 2.6 test env.
Adding warning to mark python 2.6 support as deprecated and intended to
be removed.

Testtools re-added the requirement for unittest2 so the separate
dependency for python 2.6 created a duplicate error that causes tox
to fail.

Change-Id: Ia79eeeb5d2432cf1025631a1722de5fb1babe2c9
This commit is contained in:
Darragh Bailey 2015-07-08 13:08:40 +01:00
parent edf33b3139
commit d47b37d07d
3 changed files with 7 additions and 6 deletions

View File

@ -49,6 +49,8 @@ import base64
import json
import re
import socket
import sys
import warnings
import six
from six.moves.http_client import BadStatusLine
@ -57,6 +59,10 @@ from six.moves.urllib.error import URLError
from six.moves.urllib.parse import quote, urlencode
from six.moves.urllib.request import Request, urlopen
if sys.version_info < (2, 7, 0):
warnings.warn("Support for python 2.6 is deprecated and will be removed.")
LAUNCHER_SSH = 'hudson.plugins.sshslaves.SSHLauncher'
LAUNCHER_COMMAND = 'hudson.slaves.CommandLauncher'
LAUNCHER_JNLP = 'hudson.slaves.JNLPLauncher'

View File

@ -1,7 +1,7 @@
coverage>=3.6
discover
hacking>=0.5.6,<0.11
mock
mock<1.1
unittest2
python-subunit
sphinx>=1.1.2,<1.2

View File

@ -17,11 +17,6 @@ commands =
coverage report --omit="tests/*" --show-missing
coverage html --omit="tests/*" -d cover
[testenv:py26]
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
unittest2
[tox:jenkins]
downloadcache = ~/cache/pip