9013cb1b4c
Merge pull request #1144 from The-Compiler/elcapitan-sip
...
Handle EPERM when writing rewritten bytecode.
2015-11-01 08:20:00 +01:00
f3f61fb5d1
Color highlight on the name of the failed tests
2015-10-28 08:12:57 +00:00
9a04879129
Remove commented out extrainit
...
Unused since 2012, and the docstring syntax is incorrect with
four quotes.
2015-10-20 21:08:21 +11:00
2956627b8b
Handle EPERM when writing rewritten bytecode.
...
Fixes #1143 .
2015-10-17 11:55:55 +02:00
311b0a9683
Fix situation where a traceback entry "path" returns a str object
...
Fix #1133
2015-10-16 20:18:14 -03:00
a3bda59a30
collection: Prevent non-function callables from being collected
...
Fixes issue 331
previously to this change the collection code would issue a warning for
when ever it encountered a variable that looked like a test but wasn't a
function saying that it wouldn't collect it because it wasn't a function.
This fixes the logic so that if that warning is issued it really isn't
collected.
However previously special cases existed to support tests that were
created using functools.wraps and functools.partial. So the condition for
issuing that warning has been updated to take that in to account
Also try the old way of detecting functions just for proper integration
with mock.path in python 2.7 the get_real_func returned the unbound method
2015-10-12 22:23:18 +01:00
db077555f6
Merge pull request #1102 from nicoddemus/doctest-fixtures-fix
...
Fix autouse fixtures and doctest modules
2015-10-10 14:21:53 +02:00
88c8dd96f9
issue1035 Override inspect.isclass for python 2.6
2015-10-09 19:44:47 +01:00
0e55a8793f
all tests pass
2015-10-09 09:58:12 -07:00
49d46a0059
an ugly patch to fix all but the most important part =/
2015-10-08 10:44:58 -07:00
b5b53b6aec
start 2.8.3 development
2015-10-07 17:56:05 +02:00
7c529e0afe
Merge branch '2.8.2-release'
2015-10-07 17:51:34 +02:00
42937d4bb6
Prepare 2.8.2 release.
2015-10-06 21:06:25 +02:00
493530ec6d
typo fix, changed position of context manager notes
2015-10-05 12:13:25 -07:00
a14c77aeba
Fix problems when mixing autouse fixtures and doctest modules
...
The main problem was that previously DoctestModule was setting
up its fixtures during collection, instead of letting
each DoctestItem make its own fixture setup
Fix #1100
Fix #1057
2015-10-03 16:07:14 -03:00
df874db817
Update default reason to "unconditional skip"
2015-10-03 17:02:18 +01:00
25d74a5919
Dont explicitly inherit from object
2015-10-03 16:55:04 +01:00
213dbe7a5f
newlines
2015-10-03 16:42:15 +01:00
9e57954b03
First argument in pytest.mark.skip is a reason
2015-10-03 16:42:15 +01:00
eee24138b0
Fix failing test
2015-10-03 16:42:15 +01:00
04545f8a54
classes inherit from object
2015-10-03 16:42:15 +01:00
ad0b8e31b8
Fix case where skip is assigned to as an attribute directly
2015-10-03 16:42:14 +01:00
b71add27da
Add MarkEvaluator for skip
2015-10-03 16:42:14 +01:00
5171d167ce
Move "note" to the end of the main text
...
Fix #1097
2015-10-02 18:14:17 -03:00
2981bece55
pyflakes fix
2015-10-02 13:03:43 -07:00
fd211bf490
Add a note about usage of the context manager
...
Addesses #1097
2015-10-02 12:40:58 -07:00
88209c6ac6
Merge pull request #1092 from nicoddemus/param-ids-fix
...
Param ids fix
2015-10-01 15:09:11 +02:00
688f955f5e
Merge pull request #1058 from nicoddemus/doc-how-disable-cache
...
Add docs on how to disable cache provider
2015-10-01 13:06:02 +02:00
f3cee8f0b5
Merge remote-tracking branch 'upstream/master' into param-ids-fix
2015-10-01 07:58:55 -03:00
b7fd3f0031
Merge pull request #1093 from nicoddemus/relto-bug
...
Fix internal error when filtering tracebacks where one entry was generated by an exec() statement
Fixes #995
2015-10-01 06:00:40 +02:00
d1e00f6e19
Detect dynamic code explicitly in filter_traceback
2015-09-30 17:32:49 -03:00
c9480c5b8b
Move imports outside _escape_bytes as suggested in review
2015-09-30 17:02:19 -03:00
a808e09204
fix docstring for cache fixture regarding ``/`` on keys
2015-09-30 00:27:52 -03:00
11f100813e
Fix internal error when filtering tracebacks where one entry was generated by an exec() statement
...
Fix #995
2015-09-29 22:29:43 -03:00
b64470443f
Fix SystemError when using unicode_escape on Python 3
...
Fix #1087
2015-09-29 18:20:30 -03:00
8633c4cefd
Fix encoding errors for parametrized tests with unicode parameters in py2
...
Fix #1085
2015-09-29 17:57:49 -03:00
cb58eaa611
Merge remote-tracking branch 'upstream/master' into features
...
Conflicts:
_pytest/__init__.py
testing/test_recwarn.py
2015-09-29 15:56:41 +02:00
c5fd42b699
start 2.8.2 development
2015-09-29 15:32:33 +02:00
95245b935c
- fix a flaky test on py35-xdist by calling
...
importlib.invalidate_caches()
- bump version to 2.8.1
- regen docs
- amend changelog, authors
2015-09-29 13:10:59 +02:00
f61f39efdd
Merge pull request #1052 from The-Compiler/no-std-prefix
...
Don't hardcode 'std' for captured stdout/stderr.
2015-09-29 09:19:40 +02:00
a73d517bee
Merge pull request #1080 from vodik/master
...
fix #1034 : Add missing nodeid on pytest_logwarning call in addhook. Thanks Simon Gomizelj for the PR.
2015-09-29 09:07:43 +02:00
b3727438d6
Add missing nodeid on pytest_logwarning call in addhook.
...
Otherwise KeyError: 'nodeid' gets thrown, killing pytest. This may fix
issue 1034, but the details of it may be caused by something similar
somewhere else.
2015-09-28 20:23:54 -04:00
b184f391c6
Show known environment variables in py.test --help
2015-09-28 18:34:16 -03:00
5f860181b6
Remove print left by accident
2015-09-28 18:25:20 -03:00
e8261e0c77
`deprecated_call` detects pending warnings again
...
`deprecated_call` now looks for PendingDeprecationWarnings,
as it did previously but was broken by #897 . Fixes #1037 .
Also added a test so this does not happen again.
2015-09-28 12:11:52 -04:00
971ebcbd77
simplify by removing the single-call "exclude_pytest_names" function
2015-09-28 15:43:55 +02:00
1c0ffc5caf
seems like pypy's callable builtin calls __getattr__ so we do the check
...
later.
2015-09-28 14:02:30 +02:00
4e3a807733
fix issue #1073 -- shortcut plugin hook lookup if the attrname is not
...
prefixed with pytest_.
2015-09-28 13:34:28 +02:00
910b25d416
Vendor pluggy-0.3.1
...
Fix #704
2015-09-27 16:04:29 -03:00
0c05ca1fd5
Merge branch 'master' into features
2015-09-26 10:03:42 +02:00
748da0e5d7
Fix xml generation when used with pytest-xdist
...
pytest_runtest_logreport must be careful to not depend on setup/call/teardown
being called sequentially in that order, as xdist will call them as they are reported
from the slaves
Fix #1064
2015-09-26 03:21:24 -03:00
4867554eec
Merge branch 'master' into features
2015-09-23 16:42:42 +02:00
a3fdcd9b17
Merge pull request #1031 from pytest-dev/unmarshable-parametrize
...
Parametrized values containing non-ascii bytes break cache
2015-09-23 09:03:51 +02:00
e5c76cb22d
Merge pull request #1054 from nicoddemus/cache-fixture-docstring
...
Add docstring to cache fixture
2015-09-23 09:00:01 +02:00
79ebca3f30
(w)warnings -> (w)pytest-warnings in "-r chars" help
2015-09-23 01:09:09 -03:00
25d2cc4604
Add docstring to cache fixture
...
Fixes #1049
2015-09-22 23:46:05 -03:00
e1063678f1
escape bytes when creating ids for parametrized values
2015-09-22 23:18:09 -03:00
9d1ae0a149
Merge pull request #1048 from RonnyPfannschmidt/pytest-1029
...
fixes #1029 by handling access errors for cache dirs as pytest warning
2015-09-22 19:04:04 -03:00
c10f483b9f
Don't hardcode 'std' for captured stdout/stderr.
...
This will make Item.add_report_sect more usable for plugins.
See https://github.com/eisensheng/pytest-catchlog/pull/7
2015-09-22 20:29:16 +02:00
ea9a491fb3
add an acceptance test for cache write errors
2015-09-22 20:24:37 +02:00
ca460e11e6
Merge pull request #1051 from Akasurde/issue_1027
...
Added minor documentation change in python.py
2015-09-22 17:09:25 +02:00
dc1ce51ac2
Added minor documentation change
...
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
2015-09-22 20:15:49 +05:30
29f4da93d4
handle access errors when writing cache files silently as pytest warning, fixes #1039
2015-09-22 16:28:19 +02:00
36924b59bd
Merge branch '653-deprecated-context-manager' of https://github.com/chiller/pytest into features
2015-09-22 15:14:06 +02:00
48df2f6842
Merge branch 'master' into features
2015-09-22 11:23:05 +02:00
41d61ed221
Merge pull request #1023 from RonnyPfannschmidt/fix-877
...
Fix 877
2015-09-22 11:17:02 +02:00
97f7815feb
also change pytest version to target 2.9.0
2015-09-22 11:01:33 +02:00
e2f72ffed8
start bugfix changelog on master
2015-09-22 10:59:23 +02:00
9f77a8507e
removed mutation of global state, changed filter addition in WarningsRecorder
2015-09-21 19:01:23 +01:00
beaa8e55bd
Fixes #653 use deprecated_call as context_manager
2015-09-21 19:01:23 +01:00
80897f62a6
Merge pull request #974 from nicoddemus/addoption-conftest
...
Add warning about implementing pytest_addoption in conftest files
2015-09-21 11:28:31 +01:00
b1c9b8b415
Make tmpdir resiliant to user ids that do not exist
...
Previously, the tmpdir fixture would fail if the current process's user
id does not correspond to a valid user (e.g. running pytest in a Docker
container with 'docker run -u').
2015-09-18 21:26:19 -04:00
7658f60146
#877 - reencoding causes typeerrors on python2
2015-09-19 00:30:01 +02:00
49c99a41ea
reencode non-ascii python2 assertion reprs, fixes #877
...
i decided against using a warning since the problem goes away with python3
the support code can be removed once we drop python2 in 10 years or so
2015-09-19 00:30:01 +02:00
f02d9425f9
Bump version to 2.8.0
2015-09-18 19:04:20 -03:00
1aca998f3f
Merge pull request #1012 from lukas-bednar/junitxml_plugin
...
junitxml: align custom properties with junit format
2015-09-18 16:01:22 +02:00
02a2272cfe
junitxml: move custom properties to properties element
...
<testsuite>
<testcase>
<properties>
<property name="ABC" value="XYZ" />
<property name="DEF" value="ZYX" />
</properties>
</testcase>
</testsuite>
2015-09-17 15:56:41 +02:00
fe8def98e4
Merge pull request #1020 from hpk42/pluggy031
...
re-vendor pluggy to 0.3.1 release and also fix the README
2015-09-17 14:41:32 +02:00
f4bfd571ee
re-vendor pluggy to 0.3.1 release and also fix the README
2015-09-17 13:54:23 +02:00
baf5b5d005
update changelog/author info, bump version number
2015-09-17 13:43:39 +02:00
3bcda48ba4
Merge pull request #1009 from mdboom/deprecation-warnings
...
avoid deprecation warnings, introduce helpers.
2015-09-17 13:37:26 +02:00
7eb1211192
revert setuptools_scm addition introduced with f22d14b105
2015-09-17 12:58:04 +02:00
f978b545c5
Merge pull request #1016 from hpk42/importappend3
...
revert importing test module behaviour to prepend by default
2015-09-17 12:41:28 +02:00
6192e74f03
remove __init__.py as advised by ronny
2015-09-17 10:51:03 +02:00
a62d12634c
revert importing test module behaviour to prepend by default
2015-09-16 22:12:20 +02:00
886ac82c43
Merge pull request #1013 from nicoddemus/issue1010
...
Make tmpdir more resilient in case environment variables required by getpass are missing
2015-09-16 21:57:44 +02:00
2575053697
Merge pull request #1015 from hpk42/cache-integration
...
refined pytest-cache integration
2015-09-16 21:46:46 +02:00
130e6cf8a2
Use temproot as a fallback if the current user couldn't be obtained
2015-09-16 16:42:07 -03:00
45065e4e2e
refine command line option naming and docs
2015-09-16 20:41:22 +02:00
1150e87e31
Extract get_user logic into a separate function
2015-09-16 12:47:50 -03:00
6676aeda5a
Make tmpdir more resilient in case environment variables required by getpass are missing
...
Fix #1010
2015-09-16 12:20:07 -03:00
bf74401fd3
Use __code__.co_argcount
2015-09-16 11:05:54 -04:00
08a572086b
Fix lookup of special values
2015-09-16 11:02:36 -04:00
9c19728d2b
Fix checking for args
2015-09-16 06:45:51 -04:00
859259ddae
Simplify
2015-09-16 06:43:16 -04:00
a0cefb3213
Use inspect.signature instead of inspect.getargspec
2015-09-16 06:33:53 -04: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
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
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
2cfc183029
monkeypatch: ensure the internal _savesyspath attribute always exists
2015-09-14 07:42:23 +02:00
e0645564fe
more pep8 fixes
2015-09-13 21:49:01 +02:00
1e107e6bd1
restrucure pytest.main.wrap_session to allow for non-testrun wraps
2015-09-13 19:55:44 +02:00
2e87cf4a62
create the previously missing cache fixture
...
there was a disabled test
2015-09-13 19:55:44 +02:00
e035f57535
s/--cache/--show-cache/
2015-09-13 19:55:44 +02:00
e20216a1a8
merge the pytest-cache plugin into core
2015-09-13 19:55:44 +02: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
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
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
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
dd7112d5ea
Show a few diff lines when truncating string diffs
...
Fix #934
2015-08-27 22:20:13 -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
ccf7584fac
Add warning about implementing pytest_addoption from conftest files
2015-08-27 19:14:56 -03:00
42b43a7d7b
Paths after normal options are now properly used to discover rootdir and ini files
...
Fix #949
2015-08-25 22:08:05 -03:00
e67d66a5d4
Merge branch 'pytest-dev'
...
# Conflicts:
# AUTHORS
2015-08-24 22:55:11 +03:00
b25e41e348
Merge pull request #956 from nicoddemus/record-xml-property
...
add preliminary support for extended junit xml properties
2015-08-24 09:13:04 +02:00
70da93145d
Improve docs and using warning system for record_xml_property fixture
2015-08-23 11:56:27 -03:00
06585f5bdd
Always report error about parametrize data that doesn't correspond to fixtures in test functions.
2015-08-23 13:42:40 +03:00
2ddbac1f98
Correcting implementation based on pull request feed back
2015-08-21 14:31:53 -06:00
287df16c9c
Merge pull request #817 from nicoddemus/non-collection-exit-error
...
return non-zero exit code if no tests are collected
2015-08-21 18:30:57 +02:00
24212fd97f
Add support to record custom properties on xml output
2015-08-20 17:55:38 -06:00
f730291904
Make testsfailed and testscollected public Session attributes
...
As suggested by @flub in review
2015-08-18 07:35:02 -03:00
2ffd37b816
return non-zero exit code if no tests are collected
...
Fix #812
Fix #500
2015-08-18 07:35:02 -03:00
7758bcd141
terminalwriter: extract plugin printing logic and add positive unittests
2015-08-17 09:10:01 +02:00
740a97a8cc
terinalwriter: use dash between plugin name and version
2015-08-17 08:48:38 +02:00
2c42f15e00
adapt plugin printing
...
* print each distribution only once(xdist now has 3 entrypoints)
* include the distribution version
2015-08-17 08:41:24 +02:00
37ed391cc2
Merge pull request #938 from nicoddemus/doctest-unicode
...
New ALLOW_UNICODE doctest option
2015-08-16 11:35:10 +02:00
f22d14b105
Merge pull request #879 from RonnyPfannschmidt/setuptools-scm
...
use setuptools_scm to determine the version
2015-08-15 00:56:16 +01:00
d749021a31
Fix coverage
...
Also make sure a test that doesn't set ALLOW_UNICODE fails
on Python 2 and passes Python 3.
2015-08-12 22:49:41 -03:00
420823070b
Add ALLOW_UNICODE doctest option
...
When enabled, the ``u`` prefix is stripped from unicode strings in
expected doctest output. This allows doctests which use unicode
to run in Python 2 and 3 unchanged.
Fix #710
2015-08-12 22:16:44 -03:00
41cef6f5f2
Don't skip fixtures that are substrings of params
...
Bug introduced with
https://bitbucket.org/pytest-dev/pytest/pull-requests/257/allow-to-override-parametrized-fixtures
Fix #736
2015-08-11 00:41:21 +02:00
e103932aad
Reintroduce hasplugin to PytestPluginManager
...
Fix #932
2015-08-09 19:30:49 -03:00
353360dbe5
use local isclass
2015-08-09 00:11:15 +01:00
3497aa0766
check nose.istest __test__ attr issue526
2015-08-09 00:11:15 +01:00
729b5e9b2f
Merge pull request #923 from The-Compiler/parametrize-idfunc
...
Generate parametrize IDs for enum/re/class objects.
2015-08-08 15:09:54 -03:00
4e21d1d77b
Move enum import and adjust comments.
2015-08-08 15:25:10 +02:00
84fdba129a
More style changes.
2015-08-08 12:57:54 +02:00
18125c7d1f
Clean up type comparisons.
2015-08-07 23:10:22 +02:00
b59376bea4
Alert user about other parametrize spellings.
2015-08-07 07:51:59 +02:00
13c5456868
Generate parametrize IDs for enum/re/class objects.
2015-08-07 07:37:59 +02:00
39f1471e93
Warnings always raised in WarningsRecorder
...
This ensures that if tests for warnings are run more than once,
the warning is still raised as expected.
2015-08-06 15:05:01 -04:00
f7bacd169e
Update docs
2015-08-04 00:48:41 +03:00
657ca97dbd
Some refactorings after code review
2015-08-04 00:02:03 +03:00
9846953597
Support for python 2.6
2015-08-02 17:28:27 +03:00
2fc7aede0b
Request #714 : Apply indirect=True on particular argnames
2015-08-02 16:40:40 +03:00
52b4eb6c46
Added `warns` to assert warnings are thrown
...
Works in a similar manner to `raises`, but for warnings instead
of exceptions. Also refactored `recwarn.py` so that all the
warning recording and checking use the same core code.
2015-07-30 23:28:32 -04:00
4302972c23
Use pytest-of-$user as base directory for tmpdir_factory
...
Before tmpdir_factory, pytest used to create a link named "pytest-$user" to the current numbered directory. Use
a different name so there's no conflict when running different pytest versions.
Fix #894
2015-07-28 20:57:48 -03:00
235f9da432
special-case _pytest.__init__ in genscript to avoid a python3 bug
2015-07-27 11:33:27 +02:00
e8f4819876
Test file run twice fails if it contains marked class #683
2015-07-26 12:15:29 +02:00
e68fa641ff
Merge reset-capgture-on-reeadouterr-errors
...
Merge branch 'reset-capture-on-readouterr-errors' of github.com:davidszotten/pytest into merge-capmerge
2015-07-26 11:39:03 +02:00
983d249680
reset capture even if readouterr throws
...
otherwise that exception (and all following output) end up in /dev/null
2015-07-26 01:15:51 +02:00
f64d5f1209
Merge pull request #884 from cpommranz/deprecate_genscript
...
Deprecate and warn about --genscript, fixes #730
2015-07-25 19:09:52 +02:00
251fc68ef9
Merge fix for #751
...
Merge branch 'fix-751' of github.com:JanBednarik/pytest into jb-fix-751
2015-07-25 19:03:44 +02:00
9906a19e29
Issue #751 - fix.
2015-07-25 15:38:27 +02:00
00e1a2122a
Deprecate and warn about --genscript, fixes #730
2015-07-25 15:10:22 +02:00
80ee620459
Merge pull request #881 from maartenq/master
...
setuptools not present issue deprecating gentest
2015-07-25 15:03:50 +02:00
023687d8d0
Merge pull request #872 from nicoddemus/confcutdir-inifile
...
Avoid detecting conftest files upwards from setup.cfg/pytest.ini/tox.ini by default
2015-07-25 14:03:24 +02:00
e3d60024aa
setuptools not present issue deprecating gentest
2015-07-25 13:50:40 +02:00
a060b8ff73
use setuptools_scm to determine the version
2015-07-25 10:44:18 +02:00
033def0a7a
Workaround for cmdexec bug on Windows
...
This bug fails the entire pytest suite when executed with the
--lsof option in Python 2 on Windows.
2015-07-24 19:24:31 -03:00
9f94e443ff
Merge remote-tracking branch 'upstream/pytest-2.7'
...
Conflicts:
testing/conftest.py
2015-07-24 19:24:21 -03:00
91e8e59cea
Merge pull request #860 from nicoddemus/warn-plugins-as-str-main
...
Make passing plugins as str objects a more obvious failure
2015-07-24 19:13:39 -03:00
d104487282
importorskip: Allow non-integer version strings
...
Use `pkg_resources.parse_version` to parse version strings.
This can handle 'dev', 'rc', alpha and beta version strings,
among others.
2015-07-24 12:34:06 -04:00
35bbcc39a2
Interpret strings to "plugins" arg in pytest.main() as module names
...
See #855
2015-07-23 23:37:09 -03:00
ab9e246ab0
Avoid detecting conftest files upwards from setup.cfg/pytest.ini/tox.ini files by default
...
As discussed in #82
2015-07-23 23:21:07 -03:00
df29120abe
Merge branch 'pytest-2.7'
...
Conflicts:
_pytest/config.py
_pytest/genscript.py
_pytest/mark.py
tox.ini
2015-07-23 22:35:51 -03:00
ce96973ed5
Merge pull request #864 from pytest-dev/consider-color-yes-everywhere
...
Consider --color option in more places which deal with TerminalWriters
2015-07-23 08:03:52 -03:00
0e26de2218
Merge pull request #867 from nicoddemus/autouse-yield-fixture-class
...
Fix autouse fixtures defined in a TestCase subclass
2015-07-22 01:25:21 +02:00
81f18f8a0f
Fix flakes
2015-07-21 19:55:01 -03:00
0769bb4898
Make pastebin use _pytest.config.create_terminal_writer
2015-07-21 12:55:18 -03:00
31cfbac1f4
Fix autouse fixtures defined in a TestCase subclass
2015-07-20 19:28:54 -03:00
6af7172204
Merge branch 'pytest-2.7'
2015-07-19 15:25:04 +02:00
de65737cb1
Fix flakes
2015-07-18 18:23:17 -03:00
953916df49
Report correct reason when using multiple skip/xfail markers
2015-07-18 18:18:45 -03:00
2f7d0f8bd9
Consider --color option in more places which deal with TerminalWriters
2015-07-18 16:39:55 -03:00
e227950b06
Style fix
2015-07-18 13:18:38 -03:00
d4789f1ac4
Fix AST rewriting with starred expressions in function calls
2015-07-18 13:16:47 -03:00
26e7532756
Move Interrupted exception class out of Session
2015-07-18 13:16:47 -03:00
570c4cc55a
No Starred node type on Python 2
2015-07-18 13:16:46 -03:00
728d8fbdc5
generify
2015-07-18 13:16:26 -03:00
fad569ae1b
simplify + fix
2015-07-18 13:16:26 -03:00
a4dbb27fab
a test
2015-07-18 13:16:26 -03:00
b18e6439bd
Ast Call signature changed on 3.5
...
fix issue 744 on bitbucket
port of merge request 296
https://bitbucket.org/pytest-dev/pytest/pull-request/296/astcall-signature-changed-on-35
https://bitbucket.org/pytest-dev/pytest/issue/744/
Conflicts:
CHANGELOG
2015-07-18 13:15:46 -03:00
Ronny Pfannschmidt
Gabriel Reis
John Vandenberg
Florian Bruhin
Bruno Oliveira
Michael Birtwell
TomV
Buck Golemon
Demian Brecht
Michael Aquilina
holger krekel
holger krekel
Simon Gomizelj
Eric Hunsberger
Abhijeet Kasurde
Galaczi Endre
Floris Bruynooghe
Andy Freeland
Lukas Bednar
Florian Bruhin
Michael Droettboom
David Vierra
Brianna Laugher
elizabeth
David Diaz
Markus Unterwaditzer
jakubo
David Szotten
Jan Bednařík
Christian Pommranz
Maarten
Anatoly Bubenkov
Thomas Kluyver
Matthias Bussonnier