44695ae46c
Fix CHANGELOG: obestwalter appearing twice due to mergig separate PRs
2016-06-26 23:44:07 +02:00
5891061ac1
Merge pull request #1675 from kvas-it/issue-1562
...
Add warning for assertions on tuples #1562
2016-06-26 16:09:15 -03:00
48ac1a0986
Merge branch 'remove-old-entry-points' into features
2016-06-26 20:38:59 +02:00
db9b3e9522
Merge pull request #1677 from nicoddemus/remove_cmd_options
...
Remove cmd options
2016-06-26 15:37:59 -03:00
b9536608c5
Add issue and obestwalter to CHANGELOG
...
Fix #1632
2016-06-26 20:36:04 +02:00
f7a2048e96
Merge branch 'features' of https://github.com/Avira/pytest into remove-old-entry-points
2016-06-26 20:32:38 +02:00
7239f36466
Improve formatting in CHANGELOG
2016-06-26 19:41:01 +02:00
1b0dbd8c40
Move the freezing function from genscript.py to a new module freeze_support.py
2016-06-26 19:37:24 +02:00
0e2ebc96ff
Remove deprecated cmd options
...
Fixes #1657
2016-06-26 19:26:04 +02:00
6d4cee2159
Add a test for indirect use of tuple in the assert that should not cause a warning
2016-06-26 02:21:51 +02:00
0db4ae15a9
Update changelog
2016-06-25 19:34:55 +02:00
c17027e576
Warn about asserts on tuples ( fixes #1562 )
2016-06-25 19:21:48 +02:00
68bed00d5b
Merge pull request #1667 from fengxx/feature/override_ini_option
...
Add --overwrite-ini ININAME=INIVALUE cli option
2016-06-25 18:10:10 +02:00
856e6cab75
add --override-ini option to overrides ini values
...
Signed-off-by: Ted Xiao <xiao.xj@gmail.com>
2016-06-25 23:45:32 +08:00
13a188fe37
Merge pull request #1647 from sallner/features
...
Add new options to report fixture setup and teardown
2016-06-25 16:38:37 +02:00
3a9e9fdf82
rephrase changes in CHANGELOG.rst
2016-06-25 16:04:23 +02:00
72450408ed
add changes in CHANGELOG.rst
2016-06-25 16:00:49 +02:00
2af3a7a9d7
Merge pull request #1519 from omarkohl/pytest_skip_decorator
...
Raise CollectError if pytest.skip() is called during collection
2016-06-25 15:20:34 +02:00
35cd12e4de
Merge pull request #1660 from hackebrot/parametrize-with-fixtures
...
Proposal: Parametrize with fixtures
2016-06-25 15:05:27 +02:00
1b6bc4d606
Add feature proposal to changelog
2016-06-25 14:58:18 +02:00
eb98a8eefb
Change version in issues section to pytest 3.0 only
2016-06-25 14:52:57 +02:00
acfdd85dff
Move document to proposals subfolder
2016-06-25 14:42:19 +02:00
32ca5cdb09
Update changelog for new fixture hooks.
2016-06-25 12:33:31 +02:00
891e1677b6
Remove all py.test-X* entry points.
...
The versioned, suffixed entry points are not documented and a leftover from a pre-virtualenv world. They also are broken for wheels.
2016-06-25 12:27:05 +02:00
9877bf47e3
Improve commenting for setupplan unittest.
2016-06-25 12:21:31 +02:00
7a3daac85b
Add docs for setuponly and setupplan options.
2016-06-25 12:21:12 +02:00
da5c579d82
Move setupplan and setuponly options to their respective modules.
...
Also, changed their group from "general" to "debugconfig".
2016-06-25 12:20:56 +02:00
032ce8baf6
Switch setuponly and setupplan options to a hook-based implementation.
2016-06-25 12:19:46 +02:00
5860c609ae
Remove note on scoping
2016-06-25 11:09:46 +02:00
526c564576
Fix rst bullet point lists
2016-06-25 11:06:17 +02:00
693859210a
Add yielded values to function example
2016-06-25 11:00:54 +02:00
4f8b8c8d31
Add alternative approach that uses wrappers
2016-06-25 10:55:08 +02:00
c6a711c2fc
Add proposed solution using a module function
2016-06-25 10:50:14 +02:00
84f0dcecf8
Add issues section to proposal doc
2016-06-25 10:10:57 +02:00
b3615ac29d
Update CHANGELOG with #607 and add version 3.0.0.dev1
2016-06-24 20:56:21 +02:00
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
dc55551213
Start proposal for parametrize with fixtures
2016-06-24 12:08:57 +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
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
Bruno Oliveira
RedBeardCode
Vasily Kuznetsov
holger krekel
Ted Xiao
Oliver Bestwalter
Ronny Pfannschmidt
Florian Bruhin
Raphael Pierzina
Danielle Jenkins
Omar Kohl
Stefan Zimmermann
Steffen Allner
Ronny Pfannschmidt