Skip to content

Commit

Permalink
Merge pull request httpie#51 from msabramo/testing
Browse files Browse the repository at this point in the history
Added support for tox (http://tox.testrun.org/)
  • Loading branch information
jkbrzt committed Jun 13, 2012
2 parents 28dbe9f + b3ea273 commit 284a75f
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -2,3 +2,4 @@ dist
httpie.egg-info
build
*.pyc
.tox
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -2,6 +2,7 @@ language: python
python:
- 2.6
- 2.7
- pypy
- 3.1
- 3.2
script: python tests/tests.py
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -5,7 +5,7 @@


if sys.argv[-1] == 'test':
os.system('python tests.py')
os.system('python tests/tests.py')
sys.exit()


Expand Down
19 changes: 19 additions & 0 deletions tox.ini
@@ -0,0 +1,19 @@
# Tox (http://tox.testrun.org/) is a tool for running tests
# in multiple virtualenvs. This configuration file will run the
# test suite on all supported python versions. To use it, "pip install tox"
# and then run "tox" from this directory.

[tox]
envlist = py26, py27, py30, py31, py32, pypy

[testenv]
commands = {envpython} setup.py test

[testenv:py26]
deps = argparse

[testenv:py30]
deps = argparse

[testenv:py31]
deps = argparse

0 comments on commit 284a75f

Please sign in to comment.