Skip to content

Commit 6cbd36a

Browse files
committed
Switch to pytest
1 parent 94a67a4 commit 6cbd36a

File tree

2 files changed

+35
-1
lines changed

2 files changed

+35
-1
lines changed

pytest.ini

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
[pytest]
2+
norecursedirs = build docs/_build *.egg .tox *.venv
3+
addopts =
4+
# Shows a line for every test
5+
# You probably want to turn this off if you use pytest-sugar.
6+
# Or you can keep it and run `py.test -q`.
7+
# --verbose
8+
9+
# Shorter tracebacks are sometimes easier to read
10+
--tb=short
11+
12+
# Turn on --capture to have brief, less noisy output.
13+
# You will only see output if the test fails.
14+
# Use --capture no (same as -s) if you want to see it all or have problems
15+
# debugging.
16+
# --capture=fd
17+
# --capture=no
18+
19+
# Show extra test summary info as specified by chars (f)ailed, (E)error, (s)skipped, (x)failed, (X)passed.
20+
-rfEsxX
21+
22+
# Output test results to junit.xml for Jenkins to consume
23+
# --junitxml=junit.xml
24+
25+
# Measure code coverage
26+
# --cov=mrjob
27+
# --cov-report=xml
28+
# --cov-report=term-missing

tox.ini

+7-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,10 @@
77
envlist = py26, py27, pypy
88

99
[testenv]
10-
commands = {envpython} setup.py test
10+
deps =
11+
mock
12+
pytest
13+
pytest-sugar
14+
pytest-xdist
15+
unittest2
16+
commands = py.test {posargs}

0 commit comments

Comments
 (0)