yetangitu/photo-python
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update httpretty to 0.6.5

Browse source 
(but no further due to https://github.com/gabrielfalcao/HTTPretty/issues/114)
This commit is contained in:
sneakypete81 2013-11-03 12:38:48 +00:00
parent 09203ff2b8
commit be7463518b
3 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/unit/test_http_errors.py
View file

@ -4,10 +4,6 @@ import httpretty
from httpretty import GET, POST from httpretty import GET, POST
from ddt import ddt, data from ddt import ddt, data
# TEMP: Temporary hack until httpretty string checking is fixed
if httpretty.compat.PY3:
httpretty.core.basestring = (bytes, str)
try: try:
import unittest2 as unittest # Python2.6 import unittest2 as unittest # Python2.6
except ImportError: except ImportError:

4
tests/unit/test_system.py
View file

@ -3,10 +3,6 @@ import json
import httpretty import httpretty
from httpretty import GET from httpretty import GET
# TEMP: Temporary hack until httpretty string checking is fixed
if httpretty.compat.PY3:
httpretty.core.basestring = (bytes, str)
try: try:
import unittest2 as unittest # Python2.6 import unittest2 as unittest # Python2.6
except ImportError: except ImportError:

13
tox.ini
View file

@ -2,17 +2,19 @@
envlist = py26, py27, py33, coverage envlist = py26, py27, py33, coverage
[testenv] [testenv]
commands = python -m unittest discover --catch tests/unit commands = python -m unittest discover tests/unit
deps = deps =
mock >= 1.0.0 mock >= 1.0.0
httpretty >= 0.6.1 # Hold httpretty at 0.6.5 until https://github.com/gabrielfalcao/HTTPretty/issues/114 is resolved
httpretty == 0.6.5
ddt >= 0.3.0 ddt >= 0.3.0
[testenv:py26] [testenv:py26]
commands = unit2 discover --catch tests/unit commands = unit2 discover tests/unit
deps = deps =
mock >= 1.0.0 mock >= 1.0.0
httpretty >= 0.6.1 # Hold httpretty at 0.6.5 until https://github.com/gabrielfalcao/HTTPretty/issues/114 is resolved
httpretty == 0.6.5
ddt >= 0.3.0 ddt >= 0.3.0
unittest2 unittest2
discover discover
@ -21,6 +23,7 @@ deps =
commands = coverage run --source trovebox setup.py test commands = coverage run --source trovebox setup.py test
deps = deps =
mock >= 1.0.0 mock >= 1.0.0
httpretty >= 0.6.1 # Hold httpretty at 0.6.5 until https://github.com/gabrielfalcao/HTTPretty/issues/114 is resolved
httpretty == 0.6.5
ddt >= 0.3.0 ddt >= 0.3.0
coverage coverage