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

74 Commits

Author SHA1 Message Date
Ronny Pfannschmidt 6c170201d6 Merge branch 'master' into features 2016-01-02 23:56:01 +01:00
Bruno Oliveira 1bdf71730a Complement #1255 by adding tests and docs 
Fix #1242
 2015-12-30 18:24:59 -02:00
Erik M. Bray 6e170a4a1c * Moved workaround to its own function, mostly for the sake of adding 
a more descriptive docstring (the workaround itself is just to import
  readline earlier).  I removed the conditional on targetfd from the
  workaround since it doesn't really matter.

* Added # noqa marker.

* Added changelog entry, and self to authors.
 2015-12-24 16:43:34 -05:00
Bruno Oliveira 6ac31088c5 Merge branch 'master' into merge-master-into-features 2015-12-11 23:13:50 -02:00
aselus-hub 2b2240e904 added myself to authors, added changelog entry. 2015-12-10 15:15:09 -08:00
Bruno Oliveira 8b61a332ba Merge remote-tracking branch 'bukzor/features-merge-master' into features 2015-12-10 19:03:55 -02:00
Buck Golemon eabf2f9091 Merge branch 'master' into features 
Conflicts:
	AUTHORS
	_pytest/__init__.py
	_pytest/hookspec.py
	_pytest/recwarn.py
	testing/test_recwarn.py
 2015-12-07 14:28:59 -08:00
David Vierra 1db4cbcc9f Update AUTHORS and CHANGELOG 2015-12-07 12:17:30 -10:00
Lee Kamentsky 313050b15b Suggested edits by Bruno. 
Moved fix to TestCaseFunction.setup. Added myself to AUTHORS and added entry to CHANGELOG
 2015-11-04 15:30:16 -05:00
gabriel.reis a83d5c0f08 Updated entries on CHANGELOG and AUTHORS. Ref: #1157 2015-10-28 19:35:04 +00:00
Michael Birtwell 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
Michael Aquilina 122980ecad Add myself to AUTHORS 2015-10-03 17:01:11 +01:00
holger krekel 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
holger krekel 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
Galaczi Endre beaa8e55bd Fixes #653 use deprecated_call as context_manager 2015-09-21 19:01:23 +01:00
holger krekel baf5b5d005 update changelog/author info, bump version number 2015-09-17 13:43:39 +02:00
elizabeth e67d66a5d4 Merge branch 'pytest-dev' 
# Conflicts:
#	AUTHORS
 2015-08-24 22:55:11 +03:00
Ronny Pfannschmidt 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
David Diaz 2ddbac1f98 Correcting implementation based on pull request feed back 2015-08-21 14:31:53 -06:00
Bruno Oliveira 2ffd37b816 return non-zero exit code if no tests are collected 
Fix #812
Fix #500
 2015-08-18 07:35:02 -03:00
Markus Unterwaditzer 1d5215ab4f Add myself to authors 2015-08-11 00:47:18 +02:00
Abhijeet Kasurde ab9befb197 Updated CHANGELOG and AUTHORS 2015-08-05 15:21:37 +05:30
elizabeth 54a3d6210b Update CHANGELOG and AUTHORS 2015-08-02 20:39:31 +03:00
Eric Hunsberger aac371cf07 Added myself to AUTHORS 2015-07-30 23:28:32 -04:00
Anatoly Bubenkov 6af7172204 Merge branch 'pytest-2.7' 2015-07-19 15:25:04 +02:00
Bruno Oliveira d10054a38d Merge branch 'esiegerman/summary_colors' of github.com:esiegerman/pytest 2015-07-03 18:29:17 -03:00
Kevin Cox 7fa27af408 Add `file` and `line` attributes to junit-xml output. 
This adds the `file` and `line` attributes to the junit-xml output
which can be used by tooling to identify where tests come from. This can be
used for many things such as IDEs jumping to failures and test
runners evenly balancing tests among multiple executors.

Update test_junitxml.py

Foo.
 2015-07-02 18:41:52 -04:00
Eric Siegerman 2c419c4790 Add CHANGELOG and AUTHORS entries 2015-07-02 15:47:03 -04:00
Pieter Mulder 75679f08c9 Update AUTHORS and CHANGELOG 2015-06-25 17:38:45 +02:00
holger krekel ee40ea5f6d Merge branch 'pytest-2.7' 
Conflicts:
	AUTHORS
	_pytest/__init__.py
	setup.py
	testing/conftest.py
	tox.ini
 2015-06-23 16:49:05 +02:00
Edison Gustavo Muenz 48d91def7e Added workaround to still show the diff on containers with unsortable elements. 
fix issue #718
 2015-06-19 07:51:59 -03:00
Anatoly Bubenkov 4d6fef36f4 Merge branch 'pytest-2.7' 2015-06-17 13:42:41 +02:00
Bruno Oliveira ae89436d97 Remove duplicated author from AUTHORS 2015-06-17 00:05:56 -03:00
Bruno Oliveira 2a1424e563 Merge branch 'pytest-2.7' of github.com:curzona/pytest into pytest-2.7 
Conflicts:
	AUTHORS
	CHANGELOG
 2015-06-17 00:02:26 -03:00
curzona 1871d526ac Update CHANGELOG and AUTHORS 2015-06-16 19:33:26 -07:00
Punyashloka Biswal 0c05b906d4 backport fix for #713 2015-06-16 21:27:22 -03:00
Bruno Oliveira f04e01f55f Sort AUTHORS names 2015-06-16 21:20:43 -03:00
Punyashloka Biswal 0b0406fa85 Handle reports that don't have a reprcrash 
Closes #713 (which happens because ReprFailDoctest
doesn't have a reprcrash)
 2015-06-16 18:53:20 -04:00
Ronny Pfannschmidt 33a7f03ccc sort AUTHORS and add Janne 2015-06-06 13:38:25 +02:00
holger krekel c92467df2f add changelog for latest merge 2015-06-03 23:39:00 +02:00
Floris Bruynooghe 240cd1f28d Merge cleaning of sys.modules after pytester.inline_run() 
Merged in schettino72/pytest/pytester-inline-run-clean-sys-modules
(pull request #278).
 2015-04-21 11:00:32 +01:00
Eduardo Schettino bc0ecd1d06 pytester: add method ``TmpTestdir.delete_loaded_modules()`` 
, and call it from ``inline_run()`` to allow temporary modules to be reloaded.

--HG--
branch : pytester-inline-run-clean-sys-modules
 2015-04-21 10:18:04 +08:00
holger krekel 8ed5b77aba fix issue650: introduce new --doctest-ignore-import-errors option courtesy 
of Charles Cloud.
 2015-02-26 22:02:49 +01:00
Dave Hunt d1adbf4a5c Added documentation for PYTEST_ADDOPTS environment variable, updated CHANGELOG and AUTHORS. 
--HG--
branch : env-addopts
 2015-02-09 14:11:54 +00:00
TomV f6caf230f8 fix for issue615: _format_boolop must escape % 
fix test for issue615: expression must eval False

--HG--
branch : format_boolop_percent6
 2014-10-27 08:57:58 +00:00
holger krekel ba878c6d9d add changelog entry and refactor unittest.mock.patch fix a bit 2014-07-28 10:34:01 +02:00
holger krekel c2ed29070a address issue170 by merging David Mohr's PR on adding "raises" as an optional 
argument to pytest.mark.xfail.
 2014-07-28 09:59:22 +02:00
holger krekel 040062e40c improve example for pytest integration with "python setup.py test" 
which now has a generic "-a" or "--pytest-args" option where you
can pass additional options as a quoted string.  Thanks Trevor Bekolay.
 2014-05-19 20:32:09 +02:00
Andy Freeland 2ba23e8d08 issue504: verbose output displays node IDs for each test 
Replace the verbose per-test reporting format of `file:line test_name RESULT`
with the node ID of the test, i.e. `file@line::class::method[param] RESULT`.

This patch does not update the examples in the docs; @hpk42 has a script
to regenerate those.

--HG--
branch : issue504
 2014-04-14 17:42:02 -04:00
holger krekel 85d52481b1 fix issue483: trial/py33 works now properly. Thanks Daniel Grana for PR. 2014-03-28 14:47:34 +01:00