jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,796 Commits 2 Branches 0 Tags 34 MiB
Commit Graph

428 Commits

Author SHA1 Message Date
Daniel Hahler b5b710b3ae Merge master into features 
Several conflicts, mostly due to 2c402f4bd.

Conflicts:
	.pre-commit-config.yaml
	src/_pytest/outcomes.py
	src/_pytest/python_api.py
	tox.ini
 2019-08-02 16:52:51 +02:00
Daniel Hahler f0feb6c83a fixup! tox.ini: clean up filterwarnings 2019-07-20 01:54:04 +02:00
Daniel Hahler dcbb9c1f5a tox.ini: clean up filterwarnings 
- path.local/path.readlines is not used anymore
- enhance doc for "invalid escape sequence" filter
 2019-07-20 01:24:04 +02:00
Ran Benita faf222f8fb
Merge pull request #5593 from bluetech/type-annotations-1 
Type-annotate pytest.{exit,skip,fail,xfail,importorskip,warns,raises}
 2019-07-16 22:38:20 +03:00
Ran Benita 35a57a0dfb Use flake8's extend-ignore instead of ignore 
extend-ignore adds ignores in addition to flake8's existing ignores.

The default ignores currently are:
E121,E123,E126,E226,E24,E704,W503,W504
 2019-07-14 11:12:47 +03:00
Bruno Oliveira 24a66db8d3 Remove support code for unittest 2 
Also moved a pytest_runtest_makereport hook implemented in
nose.py, but nowadays makes more sense to be implemented in
unittest.py
 2019-07-11 20:11:06 -03:00
Bruno Oliveira 7aff51ee83 Show warning about importing abcs from collections once 
This is being raised by `unittest2.compatibility`:

DeprecationWarning: Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated, and in 3.8 it will stop working
 2019-07-08 17:30:15 -03:00
Bruno Oliveira c470ade0a5 Remove 'RemovedInPytest4Warning' 2019-06-30 13:31:39 -03:00
Anthony Sottile 45af361a67 Remove stray comment from tox.ini 2019-06-27 10:46:08 -07:00
Bruno Oliveira bad7ab721a
Minor: tox: coverage: use -m with coverage-report (#5427) 
Minor:  tox: coverage: use -m with coverage-report
 2019-06-12 19:44:15 -03:00
Daniel Hahler 75cda6de53 tox: coverage: use -m with coverage-report 2019-06-09 12:51:32 +02:00
Daniel Hahler 28aa38ece6 ci: optimize twisted/pexpect related jobs 
- tox: use twisted as dep only
- Azure: move twisted/numpy to main py37 job
- Travis: move twisted to main py37 build
 2019-06-08 19:21:56 +02:00
Bruno Oliveira 4d49ba6529 Drop Python 2.7 and 3.4 support 
* Update setup.py requires and classifiers
* Drop Python 2.7 and 3.4 from CI
* Update docs dropping 2.7 and 3.4 support
* Fix mock imports and remove tests related to pypi's mock module
* Add py27 and 34 support docs to the sidebar
* Remove usage of six from tmpdir
* Remove six.PY* code blocks
* Remove sys.version_info related code
* Cleanup compat
* Remove obsolete safe_str
* Remove obsolete __unicode__ methods
* Remove compat.PY35 and compat.PY36: not really needed anymore
* Remove unused UNICODE_TYPES
* Remove Jython specific code
* Remove some Python 2 references from docs

Related to #5275
 2019-06-02 14:39:11 -03:00
Daniel Hahler 6896dbc5ca tox: pexpect: use "-m uses_pexpect" 2019-05-30 03:52:41 +02:00
Daniel Hahler 0025e4408f conftest: add uses_pexpect mark 2019-05-28 18:41:01 +02:00
Daniel Hahler 6718a2f028 ci: tox: fix py37-freeze 
Remove ``--no-use-pep517``, which appears to not be supported anymore,
and PyInstaller works without it by now.
 2019-05-14 23:49:57 +02:00
Bruno Oliveira 465b2d998a
Further "unknown marks warning" improvements (#5178) 
Further "unknown marks warning" improvements
 2019-05-11 13:28:10 -03:00
Bruno Oliveira 0594dba5ce Remove unused markers and enable --strict-markers 2019-05-09 19:36:39 -03:00
Bruno Oliveira f1183c2422 Remove the 'issue' marker from test suite 
It doesn't seem to add much value (why would one execute tests
based on that marker?), plus using the docstring for that
encourages one to write a more descriptive message about the test
 2019-05-09 19:36:38 -03:00
Bruno Oliveira ccf6c3cb46 Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2019-05-09 19:22:40 -03:00
Bruno Oliveira 2795689435 Restore usedevelop=True now that pip 19.1.1 restored the old behavior 
Fix #5167
 2019-05-06 19:42:06 -03:00
Bruno Oliveira 8532e991a5 Publish UnknownMarkWarning as part of the public API and docs 2019-04-28 10:16:07 -03:00
Daniel Hahler 7f519f8ab7 Merge master into features 2019-04-27 00:43:00 +02:00
Bruno Oliveira 19cd4d0af7 Workaround for editable installs with pip 19.1 
Related to #5167
 2019-04-25 19:40:01 -03:00
Daniel Hahler 4c0ba6017d Add a conftest to prefer faster tests 
This uses pytest_collection_modifyitems for pytest's own tests to order
them, preferring faster ones via quick'n'dirty heuristics only for now.
 2019-04-07 19:11:17 +02:00
Daniel Hahler 8907fedc79 Merge master into features (with regen branch) 2019-04-03 22:11:00 +02:00
Daniel Hahler e8eaebe595 tox.ini: regen: clear pytest cache for stable outcome 2019-04-03 19:53:00 +02:00
Zac Hatfield-Dodds 4f6c67658c Use mark-specific warning type 
So that we can ignore it in self-tests.
 2019-04-01 12:38:33 +11:00
Zac Hatfield-Dodds cda9ce198a Register marks from self-tests 2019-04-01 10:52:43 +11:00
Zac-HD 00810b9b2a Register "issue" mark for self-tests 2019-03-31 14:22:30 +11:00
Daniel Hahler e1ae469504 Merge master into features 2019-03-26 10:23:21 +01:00
Daniel Hahler 5a544d4fac tox.ini: usedevelop implies skipsdist 2019-03-22 13:23:44 +01:00
Daniel Hahler 543779fc43 tox: generic twisted factor 2019-03-20 18:41:48 +01:00
Daniel Hahler 2ade3d5c89 ci: rename "trial" tox factor to "twisted" 
Ref: https://github.com/pytest-dev/pytest/pull/4848#issuecomment-467909204
 2019-03-20 18:38:50 +01:00
Daniel Hahler c4aa57bc4c tox/setup.py: remove _PYTEST_SETUP_SKIP_PLUGGY_DEP=1 hack 2019-03-03 13:15:13 +01:00
Daniel Hahler 2970c1df24 tox: generic pluggymaster factor 2019-03-03 13:12:44 +01:00
Daniel Hahler 4290cacb86
Merge pull request #4864 from blueyed/isort-cfg 
Add config for isort
 2019-03-01 18:44:56 +01:00
Daniel Hahler f0d7773ffa tox: split default posargs in multiple env vars 
This is required for combining.

Use it for new lsof facor also.
 2019-03-01 16:49:51 +01:00
Daniel Hahler 75e1fde668 tox.ini: add config for isort 2019-03-01 14:24:18 +01:00
Daniel Hahler c30ab1014e tox: add generic nobyte and numpy factors 
Remove `py27-nobyte` from tox.ini, which was using xdist already.
Therefore this also removes `py27-xdist` from Travis.

"nobyte" was added in 036557ac to test that test_assertrewrite.py works
with a global PYTHONDONTWRITEBYTECODE=1 setting.

"numpy" is only a special dependency, and can be run together with
nobyte/xdist.
 2019-03-01 09:12:16 +01:00
Daniel Hahler 1e2810e07d tox: generic pexpect factor 2019-02-27 11:48:22 +01:00
Bruno Oliveira 2e89812fad Add unittest2 testing to trial environment 
Just noticed that `test_usefixtures_marker_on_unittest` is parametrized
for unittest2, but no environment ever installed that library.
 2019-02-24 13:21:00 -03:00
Bruno Oliveira 9cb504ca9a Add same environments to Azure as have in AppVeyor, except py37-freeze 
py37-freeze will be tackled in https://github.com/pytest-dev/pytest/issues/4807
 2019-02-18 17:23:39 -03:00
Daniel Hahler 71373b04b0 tox: add generic xdist factor 
Cherry-picked from features.

Conflicts:
	tox.ini
 2019-02-15 17:54:44 +01:00
Bruno Oliveira 04a941c818 Pass PYTEST_ADDOPTS to tox envs [skip travis] [skip appveyor] 2019-02-12 20:31:29 -02:00
Daniel Hahler 5e2d740829 tox: cleanup/revisit deps 2019-02-10 14:02:56 +01:00
Daniel Hahler 82b8ec37fc Bump tox minversion 
For c611a16afe
 2019-02-10 13:57:49 +01:00
Daniel Hahler fd1684e70b tox: use deps for pluggymaster testenvs 
https://github.com/tox-dev/tox/issues/706 has been fixed.
 2019-02-10 13:53:49 +01:00
Daniel Hahler 8b92d10fb3
Merge pull request #4751 from blueyed/fix-py-freeze 
tox: py37-freeze: use --no-use-pep517 for PyInstaller
 2019-02-08 22:01:59 +01:00
Daniel Hahler e191a65ebb tox: py37-freeze: use --no-use-pep517 for PyInstaller 
Fixes https://github.com/pytest-dev/pytest/issues/4750.
 2019-02-08 21:59:23 +01:00