f3b359f5b8
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
...
# Conflicts:
# _pytest/capture.py
# _pytest/compat.py
# _pytest/python.py
# testing/python/collect.py
# testing/test_mark.py
2017-05-03 19:04:53 -03:00
630cca2fba
Fix py35-trial environment
...
After updating to twisted 17.1.0, again the trial tests started to fail; didn't investigate too deep, decided to just
no longer delete "zope" modules when cleaning up after pytester because it seems more zope modules keep
global state that shouldn't be discarded
2017-05-02 21:05:42 -03:00
60b8339166
Issue #2383 - Show the correct error message when collect "parametrize" func with wrong args and add test for this case.
2017-04-29 14:32:09 +03:00
cccb2cc92b
Merge pull request #1834 from RonnyPfannschmidt/setuptools-scm-take-2
...
second take at setuptools_scm
2017-04-27 09:10:23 -03:00
a280e43949
fix import error
2017-04-26 15:57:55 +02:00
e02cb6d7ce
restore setuptools_scm write_to usage
2017-04-23 16:59:08 +02:00
25371ddbfd
Merge pull request #2315 from RonnyPfannschmidt/namespace-hook
...
remove pytest internal usage of the namespace hook
2017-04-21 16:24:20 -03:00
4242bf6262
use unknown to specify unknown versions
2017-04-20 21:46:58 +02:00
dcefb287fc
Try not to assume a module's file extension is .py
2017-04-19 12:26:56 -07:00
2cf422733c
restore linting, drop _pytest._version for check-manifest
2017-04-19 20:25:53 +02:00
c3aee4b1e6
second take at setuptools_scm
...
since setuptools 18.6 fixes the issues with develop installs
https://github.com/pypa/setuptools/blob/master/CHANGES.rst#186
https://github.com/pypa/setuptools/issues/439
2017-04-19 19:40:42 +02:00
cac82e71d8
Improve item.warn handling of fslocation parameter
...
Just pass fslocation forward and let the hook implementer decide what to do with the parameter
2017-04-13 19:01:14 -03:00
d9a2e70155
Change LsofFdLeakChecker to emit a warning instead of failing when detecting leaked FDs
...
Related to #2366
2017-04-13 17:34:48 -03:00
7d4ac14a31
Fix #2343 : Replace version checks by constants.
...
This way they do not have to be recomputed at runtime.
2017-04-12 08:18:09 +02:00
731776702d
Fix hook name in LsofFdLeakChecker
2017-04-11 21:55:12 -03:00
83c508eea3
Verify hooks after collection completes
...
Fix #1821
2017-04-11 21:55:12 -03:00
78ac1bf5d1
Merge pull request #2350 from nicoddemus/future-imports-rewrite
...
Ensure rewritten modules don't inherit __future__ flags from pytest
2017-04-11 20:59:05 -03:00
0ab85e7a9c
Changed behavior if --lf and --ff are both used.
...
When using both --last-failed/--lf and --failed-first/--ff pytest would
run all tests with failed tests first (as if --lf was not provied). This
patch changes it so that when using both flags, only the last failed
tests are run. This makes it easier to set --ff as the default behavior
via the config file and then selectively use --lf to only run the last
failed tests.
2017-04-10 17:46:13 +09:00
21f1c2b03f
Update fixtures.py
...
Corrected "or or" typo in docstring (and made indentation consistent).
2017-04-07 16:48:38 +01:00
1b5f898dc5
Ensure rewritten modules don't inherit __future__ flags from pytest
...
In a recent refactoring we enabled all __future__ features in pytest
modules, but that has the unwanted side effect of propagating those
features to compile()'d modules inside assertion rewriting, unless
we pass dont_inherit=False to compile().
2017-04-06 15:00:36 -03:00
417b54abed
added option to unicode plugin name
2017-04-05 13:03:11 +00:00
a542ed48a2
Convert using utf-8 instead of ascii in safe_str()
...
This way we don't lose information and the returned string is
ascii-compatible anyway
2017-03-29 15:18:41 -03:00
58ac4faf0c
Fix exception formatting while importing test modules
...
Fix #2336
2017-03-29 14:43:13 -03:00
afb1778294
put in a singular namespace hook to work around the strange issue
2017-03-28 11:45:06 +02:00
ebeba79be3
remove the namespace hook from mark after the param feature merge
2017-03-28 11:45:06 +02:00
6165939b0d
fix rebase mistakes
2017-03-28 11:45:06 +02:00
efe03400d8
fixup nose/pytest plugins
2017-03-28 11:45:06 +02:00
c9ab421398
fix python2 only import loop failure
2017-03-28 11:45:06 +02:00
147bb8aea5
correct setting pytest.config
2017-03-28 11:45:06 +02:00
7cdefce656
fix up oversights
2017-03-28 11:45:06 +02:00
92f6ab1881
fix all singular internal module imports and add a test for them
2017-03-28 11:45:06 +02:00
23bc9815c4
remove pytest_namespace from _pytest.fixtures
2017-03-28 11:45:06 +02:00
ae234786ea
remove pytest_namespace from _pytest.python
2017-03-28 11:45:06 +02:00
99c8f2d403
remove pytest_namespace from _pytest.main
2017-03-28 11:45:06 +02:00
61f418a267
hollow out pytest_namespace in _pytest.fixtures
2017-03-28 11:45:06 +02:00
9b58d6eaca
prepare a own pytest.collect fake module in oder to remove the nested builtin namespaces
2017-03-28 11:45:06 +02:00
839c936153
_pytest.mark: fix unconfigure after bad configure, still potential bug
2017-03-28 11:45:06 +02:00
7d797b7dbf
add a note about the deprecation of the pytest_namespace hook
2017-03-28 11:45:06 +02:00
9b755f6ec6
remove pytest_namespace from _pytest.skipping
2017-03-28 11:45:06 +02:00
90788defb2
remove pytest_namespace from _pytest.mark and fix latent pytest nesting bug
2017-03-28 11:45:06 +02:00
6a02cdbb35
remove pytest_namespace from _pytest/runner.py
2017-03-28 11:45:06 +02:00
c74103f395
remove pytest_namespace from recwarn and fixture decorators
2017-03-28 11:45:06 +02:00
794fd5658c
remove pytest_namespace from _pytest/debugging.py
2017-03-28 11:45:06 +02:00
fab9b993f8
remove pytest_namespace from _pytest.freeze_support
2017-03-28 11:45:06 +02:00
5818e65cf3
remove pytest_namespace from _pytest/assertion
2017-03-28 11:35:29 +02:00
2c730743f1
Fix errors related to warnings raised by xdist
...
- pytester was creating a 'pexpect' directory to serve as temporary dir, but due to the fact that
xdist adds the current directory to sys.path, that directory was being considered as candidate
for import as a package. The directory is empty and a warning was being raised about
it missing __init__ file, which is now turned into an error by our filterwarnings config
in pytest.ini.
- Decided to play it safe and ignore any warnings during `pytest.importorskip`.
- pytest-xdist and execnet raise two warnings which should be fixed upstream:
pytest-dev/pytest-xdist/issues/133
2017-03-21 22:17:07 -03:00
fa56114115
Clean up warnings generated by pytest's own suite
2017-03-20 22:13:17 -03:00
d027f760c0
Avoid displaying the same warning multiple times for an item
2017-03-20 20:40:53 -03:00
3373e02eae
Add __future__ imports to warnings module
2017-03-20 20:06:01 -03:00
9f85584656
Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings
2017-03-20 19:59:05 -03:00
Bruno Oliveira
Vitaly Lashmanov
Ronny Pfannschmidt
Kodi Arfer
Michael Howitz
Jonas Obrist
Ben Lloyd
reut