2093889ac2
Merge pull request #1011 from hpk42/master
...
merge latest pytest-2.7 changes
2015-09-16 11:22:05 -03:00
fdd23878ec
Merge latest changes from branch 'pytest-2.7'
...
Conflicts:
_pytest/__init__.py
doc/en/fixture.rst
setup.cfg
testing/test_runner.py
2015-09-16 09:26:55 +02:00
b4c47c0ac0
Merge pull request #1006 from hpk42/pytest-2.7
...
some fixes, streamlines to get 2.7.3 out the door
2015-09-15 11:37:38 +01:00
5af262daa3
fix flakes problem, configure devpi upload to always upload wheels and sdist
2015-09-15 12:28:09 +02:00
16720b96b4
fix a few issues with pytest-2.7 branch and bump version number
...
- importorskip: skip a test if we have a minversion but cannot parse
version numbers due to pkg_resources not present
- make runner tests work with latest xdist
2015-09-15 12:17:52 +02:00
b2b003dcac
Merge pull request #1001 from RonnyPfannschmidt/exitcode-refactor
...
restrucure pytest.main.wrap_session to allow for non-testrun wraps
2015-09-14 15:56:04 -03:00
c5bf148ed7
Merge pull request #959 from nicoddemus/vendor-pluggy
...
Vendor pluggy
2015-09-14 18:37:52 +02:00
81018f1996
restrucure pytest.main.wrap_session to allow for non-testrun wraps
2015-09-14 18:34:29 +02:00
a13f23d218
Merge branch 'master' into vendor-pluggy
2015-09-14 12:22:18 -03:00
6d5641afce
Merge pull request #999 from nicoddemus/fix-appveyor
...
Use pip and tox from py27 in appveyor
2015-09-14 17:20:46 +02:00
9396489b4c
Remove unused run_with_env script
2015-09-14 11:28:07 -03:00
2eb3bdf132
Merge pull request #998 from nicoddemus/py35
...
Use python "3.5" on travis
2015-09-14 16:16:42 +02:00
a0dd478637
Use pip and tox from py27 in appveyor
2015-09-14 10:59:10 -03:00
1d1eac4c6b
Use python "3.5" on travis
2015-09-14 10:36:20 -03:00
d6bb5cb6c1
Ignore vendored_packages folder for coverage purposes
2015-09-14 10:30:58 -03:00
d79c89beba
Merge pull request #997 from RonnyPfannschmidt/monkeypatch-cleanup
...
monkeypatch: ensure the internal _savesyspath attribute always exists
2015-09-14 10:25:09 -03:00
2cfc183029
monkeypatch: ensure the internal _savesyspath attribute always exists
2015-09-14 07:42:23 +02:00
c7888d1d97
Add note in changelog about issue 960
2015-09-12 11:17:50 -03:00
41d2faccea
Merge branch 'issue_960' of https://github.com/Akasurde/pytest
2015-09-12 10:57:23 -03:00
dd69394598
Added testcase and help for report option
...
Fix added to show help of new reporting option 'a'.
Also, added testcase for checking reporting functionality
with option 'a'.
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
2015-09-11 12:24:45 +05:30
c40947e651
Added fix for specifying every option for reporting
...
The fix will add option 'a' to reporting which will ease task of
adding all options or reporting at once.
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
2015-09-10 15:43:43 +05:30
b6f876e721
Fix --target parameter for pip install
2015-09-07 14:13:41 -03:00
5a1c679f78
Keep *dist-info directory on vendored_packages
2015-09-07 14:09:59 -03:00
0b3f1b4a7c
Create `_pytest.vendored_packages` and _pytest._pluggy
...
- Replace imports from "pluggy" to "_pytest._pluggy"
- Fallback to import "pluggy" from global namespace if
not found in _pytest.vendored_packges
2015-09-07 13:01:54 -03:00
e622975ffd
Merge pull request #987 from benauthor/master
...
Document single-method usage
2015-09-04 17:24:15 -03:00
6ffb659282
Document single-method usage
...
It is possible to run a single test method in a class, but the syntax is
not glaringly obvious and documentation would help people out.
2015-09-04 15:11:57 -04:00
8625eb643e
Merge pull request #986 from RonnyPfannschmidt/early-logging
...
replay initial warnings when terminalreporter is loaded
2015-09-02 19:10:53 -03:00
76f0988551
turn the pytest_logwarning hook historic
2015-09-02 18:49:49 +02:00
348e519437
Merge pull request #962 from nicoddemus/doctest-skip
...
Make doctest SKIP option register doctests as SKIPPED rather than PASSED
2015-09-01 12:31:35 +02:00
7292212d5a
Merge pull request #976 from nicoddemus/ren-warnings-on-terminal
...
Rename "warnings" to "pytest-warnings" in terminal output
2015-09-01 07:56:42 +02:00
4ad56e84a8
Make doctest SKIP option register doctests as SKIPPED rather than PASSED
...
Fix 957
2015-08-31 21:25:11 -03:00
e3734ef337
Add CHANGELOG entry about renaming "warnings" to "pytest-warnings"
2015-08-31 21:21:29 -03:00
06a70b6d6d
Merge pull request #982 from codewarrior0/patch-1
...
Add notes to docstring of `monkeypatch.undo()`
2015-08-31 21:18:53 -03:00
3fa261564b
replay initial warnings when terminalreporter is loaded
2015-08-31 21:54:12 +02:00
18d175708c
Merge pull request #983 from The-Compiler/issue-979
...
Fix overriding of fixtures with parametrization.
2015-08-31 15:21:45 +02:00
19791546da
Add docstring.
2015-08-31 15:11:57 +02:00
885e461ae3
Fix overriding of fixtures with parametrization.
...
Fixes #979 , see #926 .
2015-08-31 14:38:39 +02:00
3a27cd87ce
Adjust phrasing in monkeypatch.undo docstring
...
s/test invocation/test function invocation/
2015-08-29 19:00:00 -10:00
6380e19f07
Add notes to docstring of `monkeypatch.undo()`
...
Note that calling `undo()` is generally not needed, and describe the "gotcha" discovered in #981 .
2015-08-29 16:53:57 -10:00
c0eec5d61c
Merge pull request #975 from nicoddemus/fix-regression-parse-known-args
...
Fix regression caused by changing the signature for parse_known_args
2015-08-29 23:44:32 -03:00
c493f263b6
Merge branch 'Elizaveta239-master' closes #908
2015-08-29 17:34:35 +10:00
553aef57aa
Merge pull request #978 from nicoddemus/string-diff
...
Show a few diff lines when truncating string diffs
2015-08-28 09:04:39 +01:00
9f30ae9850
Merge pull request #977 from nicoddemus/marks-fixtures-note
...
Add note that using marks on fixtures is not supported
2015-08-28 06:16:49 +02:00
dd7112d5ea
Show a few diff lines when truncating string diffs
...
Fix #934
2015-08-27 22:20:13 -03:00
b49bedcf0c
Merge branch 'master' of git://github.com/Elizaveta239/pytest into Elizaveta239-master
2015-08-28 11:10:22 +10:00
87cb5bc5b7
Add note that using marks on fixtures is not supported
...
Fix #964
2015-08-27 20:11:18 -03:00
e59471766a
Rename "warnings" to "pytest-warnings" in terminal output
...
Fix #970
2015-08-27 19:59:52 -03:00
4533a50542
Fix regression caused by changing the signature for parse_known_args
...
Fix #973
2015-08-27 19:35:32 -03:00
06b1b69fb7
Merge pull request #963 from nicoddemus/cookiecutter-docs
...
Mention cookie-cutter in the docs and fix broken links to <extplugin>
2015-08-26 16:41:56 -03:00
333cb27272
Merge pull request #961 from nicoddemus/args-after-options
...
Paths after normal options are now properly used to discover rootdir and ini files
2015-08-26 12:50:19 -03:00
Bruno Oliveira
holger krekel
Floris Bruynooghe
Ronny Pfannschmidt
Anatoly Bubenkov
Abhijeet Kasurde
Evan Bender
Florian Bruhin
David Vierra
Brianna Laugher
Florian Bruhin