floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,384 Commits 32 Branches 205 Tags
5ebcb34fb595c7652ccda889f69b2d4e3ca6443b
Commit Graph

631 Commits

Author SHA1 Message Date
Brianna Laugher
b49bedcf0c Merge branch 'master' of git://github.com/Elizaveta239/pytest into Elizaveta239-master 2015-08-28 11:10:22 +10:00
elizabeth
e67d66a5d4 Merge branch 'pytest-dev' 
# Conflicts:
#	AUTHORS
 2015-08-24 22:55:11 +03:00
elizabeth
06585f5bdd Always report error about parametrize data that doesn't correspond to fixtures in test functions. 2015-08-23 13:42:40 +03: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
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
Bruno Oliveira
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
Brianna Laugher
36b86af4b9 Added more test cases 2015-08-08 19:20:09 +02:00
Brianna Laugher
40fa7b25c5 Merge branch 'master' of git://github.com/Elizaveta239/pytest into Elizaveta239-master 
Fixed merge conflict in CHANGELOG
 2015-08-08 18:54:53 +02:00
Florian Bruhin
b59376bea4 Alert user about other parametrize spellings. 2015-08-07 07:51:59 +02:00
Florian Bruhin
13c5456868 Generate parametrize IDs for enum/re/class objects. 2015-08-07 07:37:59 +02:00
elizabeth
657ca97dbd Some refactorings after code review 2015-08-04 00:02:03 +03:00
elizabeth
db9809d6dc Update test for error in 'indirect' parameter 2015-08-02 23:53:44 +03:00
elizabeth
63bac67fb5 Add test for bad value in argument 'indirect' 2015-08-02 23:06:24 +03:00
elizabeth
15b865f502 Rewrite test using @pytest.fixture 2015-08-02 20:30:23 +03:00
elizabeth
2fc7aede0b Request #714: Apply indirect=True on particular argnames 2015-08-02 16:40:40 +03:00
Eric Hunsberger
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
Florian Bruhin
2ab4bf13ab Document and test stacking of parametrize. 
Closes #815.
 2015-07-26 14:39:13 +02:00
Jan Bednařík
f78d87ee38 Issue #751 - test. 2015-07-25 15:38:11 +02:00
Bruno Oliveira
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
Anatoly Bubenkov
6af7172204 Merge branch 'pytest-2.7' 2015-07-19 15:25:04 +02:00
Bruno Oliveira
2f7d0f8bd9 Consider --color option in more places which deal with TerminalWriters 2015-07-18 16:39:55 -03:00
Bruno Oliveira
dcdc823dd2 Support for tests created with functools.partial 
Fix #811
 2015-07-16 20:37:03 -03:00
Bruno Oliveira
0f52856f99 Use a subdirectory in the TEMP directory to speed up tmpdir creation 
Fix #105
 2015-07-15 20:03:58 -03:00
Bruno Oliveira
5ec2a17f08 --fixtures only shows fixtures from first file 
Fix #833
 2015-07-12 17:32:39 -03: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
Bruno Oliveira
eb73db56c7 Fix issue where pytest.raises() doesn't always return Exception instance in py26 
Fixes #767
 2015-06-19 07:46:47 -03:00
holger krekel
bddc88f09e adapt to pluggy naming, rename pytest.hookspec_opts to pytest.hookspec,s ame with hookimpl_opts 
--HG--
branch : pluggy1
 2015-05-06 10:08:08 +02:00
holger krekel
9aec5cd52d use runpytest() instead of runpytest_inprocess if a test can run as subprocess as well 
--HG--
branch : testrefactor
 2015-04-28 12:05:08 +02:00
holger krekel
db5649ec6a streamline pytester API majorly: 
- integrate conftest into pytester plugin
- introduce runpytest() to either call runpytest_inline (default) or
  runpytest_subprocess (python -m pytest)
- move testdir.inline_runsource1 to pdb tests
- strike some unneccessary methods.
- a new section "writing plugins" and some better pytester docs

--HG--
branch : testrefactor
 2015-04-28 11:54:53 +02:00
holger krekel
a8afba054a - refine lsof checking 
- make runpytest() create an inline testing process instead of
  a subprocess one

--HG--
branch : testrefactor
 2015-04-28 11:54:46 +02:00
holger krekel
d3e363b97a - make API between runpytest() and inline_run() more similar 
- shift a number of tests to become inline_run() tests

--HG--
branch : testrefactor
 2015-04-28 11:54:45 +02:00
holger krekel
424e5d1394 make test suite more tolerable against xdist causing warnings itself (which it does 
currently)

--HG--
branch : plugtestfix
 2015-04-27 15:06:47 +02:00
holger krekel
d2a5c7f99b add documented hookimpl_opts and hookspec_opts decorators 
so that one doesn't have to use pytest.mark or function-attribute setting anymore

--HG--
branch : more_plugin
 2015-04-25 11:29:11 +02:00
holger krekel
d632a0d5c2 merge conftest management into PytestPluginManager 
--HG--
branch : plugin_no_pytest
 2015-04-22 14:15:42 +02:00
holger krekel
5c8e5acf9d change test module importing behaviour to append to sys.path 
instead of prepending.  This better allows to run test modules
against installated versions of a package even if the package
under test has the same import root.  In this example::

   testing/__init__.py
   testing/test_pkg_under_test.py
   pkg_under_test/

the tests will preferrably run against the installed version
of pkg_under_test whereas before they would always pick
up the local version.

--HG--
branch : prefer_installed
 2015-04-17 22:25:35 +02:00
holger krekel
3ed3e51997 fix issue660: properly report fixture scope mismatches independent 
from fixture argument ordering.

--HG--
branch : issue660
 2015-04-01 18:42:48 +02:00
holger krekel
d2a8866bce bump verrsion to python2.7, fix a too precise test for windows, regen docs 2015-03-26 09:34:10 +01:00
Brianna Laugher
43e4fcf6dd Raise specific MarkerError rather than generic ValueError 
--HG--
branch : issue463
 2015-03-23 20:01:58 +01:00
Brianna Laugher
ac17f20d98 #463 
Raise a ValueError early if user misspells 'parametrize' as 'parameterize'.

--HG--
branch : issue463
 2015-03-21 23:06:25 +01:00
Bruno Oliveira
eead0365b5 Merged in parametrized-fixture-override (pull request #257) 
allow to override parametrized fixtures with non-parametrized ones and vice versa
 2015-03-12 09:40:56 -03:00
Daniel Hahler
5d6b0a59c0 Strip docstrings in output with --fixtures 
Fixes https://bitbucket.org/pytest-dev/pytest/issue/550.

--HG--
branch : strip-docstrings-from-fixtures
 2015-03-04 17:00:24 +01:00
Anatoly Bubenkov
d083153548 fix typo 
--HG--
branch : parametrized-fixture-override
 2015-03-02 20:18:06 +01:00
Anatoly Bubenkov
c4623939af support override of the parametrized fixture on the test level 
--HG--
branch : parametrized-fixture-override
 2015-03-01 15:15:37 +01:00
Anatoly Bubenkov
060609317a allow to override parametrized fixtures with non-parametrized ones and vice versa 
--HG--
branch : parametrized-fixture-override
 2015-03-01 13:54:43 +01:00
Ronny Pfannschmidt
5941b2e071 fix issue 655: crude workarounds around python2/3 exception leaks 2015-01-09 19:55:49 +01:00
Floris Bruynooghe
8d19ccb56f Merged in pfctdayelise/pytest/issue351 (pull request #161) 
Fixes issue351: Add ability to specify parametrize ids as a
callable, to generate custom test ids. + tests, docs

Hg branch merge
 2014-10-22 23:18:01 +01:00
holger krekel
0253f7b8d5 remove all occurences of "__multicall__" on hook impls in pytest/*. 
also simplify pytest_runtest_markereport hook in _pytest/skipping.py
while touching the code anyway.
 2014-10-08 20:23:40 +02:00
Floris Bruynooghe
ab005a4261 Functional tests for id function 
--HG--
branch : issue351
 2014-10-08 00:11:32 +01:00
holger krekel
b6dcfd4377 fix conftest related fixture visibility issue: when running with a 
CWD outside a test package pytest would get fixture discovery wrong.
Thanks to Wolfgang Schnerring for figuring out a reproducable example.

--HG--
branch : conftest-nodeid
 2014-09-15 12:44:16 +02:00
Floris Bruynooghe
4e8438afc8 Simply show the node ID for verbose output 
This strips the line number, /@\d/, from the verbose output so it is
directly the node ID of the test.  This in turn means no special logic
for accepting the line number as part of the node ID is needed when
parsing the command line.
 2014-08-01 00:29:35 +01:00