d81f23009b
Raise CollectError if pytest.skip() is called during collection
...
pytest.skip() must not be used at module level because it can easily be
misunderstood and used as a decorator instead of pytest.mark.skip, causing the
whole module to be skipped instead of just the test being decorated.
This is unexpected for users used to the @unittest.skip decorator and therefore
it is best to bail out with a clean error when it happens.
The pytest equivalent of @unittest.skip is @pytest.mark.skip .
Adapt existing tests that were actually relying on this behaviour and add a
test that explicitly test that collection fails.
fix #607
2016-06-24 20:56:21 +02:00
0c63762d9c
Merge pull request #1654 from tomviner/issue1503/remove_collapse_false
...
Fixes #1503 no longer collapse false explanations
2016-06-24 12:53:49 -03:00
7612b650a0
update sprint page to be past tense
2016-06-24 17:24:06 +02:00
62255d8000
rm global header
2016-06-24 17:12:41 +02:00
ea5bda0898
remove links to funding campaign
2016-06-24 17:11:29 +02:00
77689eb486
Fixes #1503 no longer collapse false explanations
2016-06-24 15:35:24 +02:00
3d263c64c3
Merge pull request #1626 from tomviner/issue1625/rename-getfuncargvalue
...
issue1625, rename getfuncargvalue to getfixturevalue
2016-06-24 08:58:32 -03:00
dc55551213
Start proposal for parametrize with fixtures
2016-06-24 12:08:57 +02:00
df9918eda3
issue1625, name getfuncargvalue to getfixturevalue
2016-06-24 10:08:19 +02:00
c6af737d4e
Fix fixture parameter display when ids is a function
2016-06-23 10:54:22 +02:00
1a5e530b98
Fix capturing with --setup-only/--setup-plan
2016-06-23 10:23:04 +02:00
f2bb3df310
Merge pull request #1645 from userzimmermann/sprint/addoption-check
...
added check for already existing option names to OptionGroup.addoption()
2016-06-23 07:52:46 +02:00
6359e75ff8
Trivial spelling fix in runtest_setup.py
2016-06-22 20:18:00 +02:00
69bab4ab04
added check for already existing option names to OptionGroup.addoption()
2016-06-22 18:01:35 +02:00
ecc97aa3b9
Use correct links in changelog.
2016-06-22 17:52:13 +02:00
dd97a2e7c8
Merge from upstream
2016-06-22 17:51:48 +02:00
0dbf77e08e
Add to changelog and authors.
2016-06-22 17:37:58 +02:00
f7d50dfa91
Add a test for handling of dynamic requests for fixtures from other fixtures
2016-06-22 17:24:55 +02:00
7d60fcc098
Merge pull request #1643 from RonnyPfannschmidt/merge-master
...
Merge master
2016-06-22 17:05:59 +02:00
c8c32fd9c0
Merge with upstream
2016-06-22 17:00:35 +02:00
61992b4e22
Implement --setup-plan option
2016-06-22 16:45:36 +02:00
f59d8f7720
Fix the tests ( #3 )
...
* Fix the tests
* Fix .format string failures on python 2.6
2016-06-22 16:23:58 +02:00
18ef7de96b
merge from master again
2016-06-22 16:03:52 +02:00
e96cd51a2a
Merge remote-tracking branch 'upstream/features' into merge-master
2016-06-22 16:03:00 +02:00
f7585c7549
Merge pull request #1635 from Avira/master
...
Add test for change in pull request #1631
2016-06-22 15:49:09 +02:00
9cb851716d
Merge pull request #1644 from KangarooCreativeTeam/patch-1
...
cache.rst: Fix wrong command used
2016-06-22 15:46:09 +02:00
a2420ce051
Merge pull request #1640 from Avira/features
...
Add tests for entry points (#1629 )
2016-06-22 15:41:19 +02:00
be1dabd6a9
cache.rst: Fix wrong command used
...
The "Inspecting Cache content" section was showing --cache-clear command,
but should actually be using --cache-show command.
Also; update AUTHORS
2016-06-22 14:04:02 +01:00
5e0d78f4f1
Fix .format string failures on python 2.6
2016-06-22 14:53:37 +02:00
083f64100d
merge master into features
2016-06-22 14:39:33 +02:00
db79ed5c4d
Add tests to make sure expected entry points exist ( #1629 )
2016-06-22 14:28:53 +02:00
fb79fa711b
Merge branch 'issue1553/diff-final-newline' of https://github.com/tomviner/pytest
2016-06-22 14:21:30 +02:00
1a75139f72
Fix the tests
2016-06-22 13:25:46 +02:00
ee311e1eae
Merge pull request #2 from kvas-it/features
...
Add printing of fixture dependencies
2016-06-22 13:04:23 +02:00
2c5c4f3f78
Add printing of fixture dependencies
2016-06-22 12:54:36 +02:00
2c6cfa42fa
Disable capturing for setuponly output
2016-06-22 12:14:35 +02:00
de9ed5e3f4
Merge pull request #1 from kvas-it/features
...
Factor setuponly code out of runtestprotocol().
2016-06-22 12:04:45 +02:00
92bcc36266
Refactor logging of fixtures
2016-06-22 12:01:51 +02:00
7d19f83982
Add test for setuponly option
2016-06-22 12:00:45 +02:00
7d87a1b127
Add test for failing assertion
...
Should contain function name that caused the failure (see pull request #1631 ).
2016-06-22 11:23:50 +02:00
6874c3a3cc
Factor setuponly code out of runtestprotocol().
2016-06-22 11:09:54 +02:00
24179dc99f
Merge pull request #1639 from tomviner/fix-changelog-links
...
fix changelog links
2016-06-22 10:49:35 +02:00
ec25d398a5
fix changelog links
2016-06-22 10:06:14 +02:00
98adf204b2
issue 1553: Include terminal newlines in diffs
2016-06-22 09:50:15 +02:00
499c9551c8
Implement working version of --setuponly
2016-06-22 09:42:45 +02:00
144dc12e55
Merge pull request #1638 from blueyed/fix-CONTRIBUTING
...
CONTRIBUTING.rst: spelling fixes
2016-06-22 04:28:15 -03:00
09389d2b20
CONTRIBUTING.rst: spelling fixes
...
[ci skip]
2016-06-22 09:14:07 +02:00
c3ee1c17bc
Merge pull request #1620 from tomviner/issue460/parameterized-subrequest
...
Issue 460: Fail on getfuncargvalue(<fixture with params>)
2016-06-21 13:43:06 -03:00
4350f499b2
Merge branch 'issue1629' of https://github.com/davehunt/pytest into features
2016-06-21 18:37:14 +02:00
61ede096a3
Merge pull request #1631 from Avira/master
...
help the user in the rare case this assertion actually fails
2016-06-21 13:17:52 -03:00
Omar Kohl
Bruno Oliveira
Brianna Laugher
Tom Viner
Raphael Pierzina
Vasily Kuznetsov
Ronny Pfannschmidt
Florian Bruhin
Stefan Zimmermann
Steffen Allner
Ronny Pfannschmidt
HEAD KANGAROO
Oliver Bestwalter
Daniel Hahler