Commit Graph

5598 Commits

Author SHA1 Message Date
Quentin Pradet 653a53226a Add strict parameter to xfail marker doc 2016-03-22 16:01:51 +04:00
Quentin Pradet 1fbd19b8cb Fix pytest.mark.skip mark when used in strict mode 2016-03-22 15:40:34 +04:00
Ceridwen 4405dd0ffe Escape both bytes and unicode strings for "ids" in Metafunc.parametrize 2016-03-22 01:31:48 -04:00
Ronny Pfannschmidt 890c2fa555 Merge pull request #1469 from omarkohl/doc-fixes
Doc fixes
2016-03-20 20:48:36 +01:00
Omar Kohl 725290a8ab Add 'Minor doc fixes' to CHANGELOG 2016-03-20 20:39:31 +01:00
Ronny Pfannschmidt da1045151f Merge pull request #1468 from palaviv/allow-none-as-parametrized-test-id
None in paramtrized test id will use automatically generated id
2016-03-20 20:19:50 +01:00
Omar Kohl 98c707561c Document --full-trace option and KeyboardInterrupt
fix #513
2016-03-20 20:07:16 +01:00
Omar Kohl a341dddc74 Replace --fulltrace with --full-trace in doc
Since 'py.test --help' shows --full-trace as an option (and not --fulltrace)
even though both forms are accepted I assume --full-trace is the preferred form
and should therefore be used in the documentation.
2016-03-20 19:51:23 +01:00
palaviv dd384f7f78 Added changlog entries 2016-03-20 19:01:47 +02:00
palaviv 7885e43b78 Merge remote-tracking branch 'upstream/features' into allow-none-as-parametrized-test-id 2016-03-20 18:57:17 +02:00
palaviv 32f44ce2fd updated parametrize documentation 2016-03-20 18:54:48 +02:00
Omar Kohl 16e49d96d1 Replace --traceconfig with --trace-config in doc
Since 'py.test --help' shows --trace-config as an option (and not
--traceconfig) even though both forms are accepted I assume --trace-config is
the preferred form and should therefore be used in the documentation.
2016-03-20 17:12:50 +01:00
Omar Kohl ec62a3c9e4 Fix minor typo in 'writing plugins' doc 2016-03-20 17:01:04 +01:00
Omar Kohl f70ed83479 Fix 'test grouping by fixture instances' doc example
The fin() function was never added as a finalizer and did therefore not print
anything in the captured output.

In general improve the output by making it more verbose/explicit and extend the
final explanation.
2016-03-20 15:53:32 +01:00
Omar Kohl dff914cadd Add short explanation and link to yield fixtures in fixture doc 2016-03-20 14:10:20 +01:00
Omar Kohl 3135463573 No longer refer to the 'yield fixture mechanism' as experimental (doc)
The feature has been there for a long time and in the 2.7.1 release notes it
says:

> fixed docs to remove the notion that yield-fixtures are experimental.

Therefore this one place was probably just missed.
2016-03-20 13:54:56 +01:00
Omar Kohl 266b53dfc2 Add Jenkins xUnit Plugin link to doc 2016-03-20 13:39:10 +01:00
Omar Kohl bdb3581a52 Fix minor mistake in test discovery doc
The example output shown was for Python3 not Python2.

Add Python2 output and rephrase for clarity.
2016-03-20 13:24:43 +01:00
Omar Kohl 27b62740e3 Fix minor mistake in usage doc (pkg instead of pypkg) 2016-03-20 12:47:17 +01:00
Roman Bolshakov 52bc2f8616 Update authors & changelog 2016-03-20 01:06:53 +03:00
Roman Bolshakov a736e26734 Merge remote-tracking branch 'pytest-dev/master' into fix-issue-138 2016-03-20 01:04:22 +03:00
Roman Bolshakov fbc5ba08d9 Fix issue #138 2016-03-20 01:02:17 +03:00
palaviv 4b0237c8ee added test for unique names when recievieng identical ids in parametrize 2016-03-19 21:42:47 +02:00
palaviv 877ca5a0bf added test for None in paramtrized ids list 2016-03-19 21:38:24 +02:00
palaviv a8cfd54871 added test for None in idmaker 2016-03-19 21:23:49 +02:00
palaviv be1954afbc allow None to be passed in ids list for specific test and recieve idmaker name for test 2016-03-19 21:22:49 +02:00
Bruno Oliveira 2cfcf12d09 Merge pull request #1466 from nicoddemus/merge-master-into-features
Merge master into features after 2.9.1 release
2016-03-18 23:45:14 -03:00
Bruno Oliveira 5fcce8a7d6 Merge branch 'master' into merge-master-into-features 2016-03-18 18:26:56 -03:00
Bruno Oliveira a70e92777f Bump version to 2.9.2.dev1 2016-03-18 18:24:24 -03:00
Bruno Oliveira 3c011c05db Merge pull request #1460 from nicoddemus/release-2.9.1
Release 2.9.1
2016-03-18 18:22:21 -03:00
nicoddemus 168daaa71f Regendocs 2016-03-17 17:13:41 -04:00
nicoddemus 43fc1b47c0 Add announce doc 2016-03-17 17:10:02 -04:00
nicoddemus 699f094b0c Finalize CHANGELOG for 2.9.1 2016-03-17 17:04:26 -04:00
nicoddemus 9bdf51fcc5 Bump version to 2.9.1 2016-03-17 17:03:46 -04:00
Ronny Pfannschmidt 1d23999033 Merge pull request #1458 from The-Compiler/talks
Update talks page
2016-03-17 09:09:35 +01:00
Florian Bruhin 1d35a03812 Update talks page 2016-03-17 06:37:49 +01:00
Bruno Oliveira ceacc12b52 Merge pull request #1454 from tareqalayan/add-global-properties-node
junitxml: add properties node in testsuite level
2016-03-16 18:21:51 -03:00
Tareq Alayan fa6acdcfd4 junitxml: add properties node in testsuite level
The commit allow users to add a properties node in testsuite level see
example below:

<testsuite errors="0" failures="0" name="pytest" skips="1" tests="1"
time="11.824">
  <properties>
    <property name="ARCH" value="PPC"/>
    <property name="OS" value="RHEL 7.2"/>
    <property name="TestPlanURL" value="https://url.."/>
    <property name="Automated" value="True"/>
  </properties>
  <testcase classname="git.....>
  </testcase>
</testsuite>

The current situation is that properties node can be added to every
testcase node. However, sometimes we need some global properties that
applies to all testcases and give better description for the testsuite
itself.
2016-03-16 13:24:33 +02:00
Ronny Pfannschmidt d70596da91 Merge pull request #1452 from palaviv/specify-paramterized-node-in-command-line
Specify paramterized node in command line - fixes #649
2016-03-16 11:16:54 +01:00
palaviv a1277aaf0e added TODO comment to remove the parametrized workaround 2016-03-15 23:42:25 +02:00
Ronny Pfannschmidt 5fd82078ad Merge pull request #1441 from kalekundert/features
Add a convenience function for floating-point comparisons
2016-03-15 07:45:07 +01:00
Kale Kundert 5ceee08590 Fix CHANGELOG merge conflicts. 2016-03-14 11:55:50 -07:00
Kale Kundert 0dcc862a56 Fix some typos in the documentation. 2016-03-14 11:38:00 -07:00
Kale Kundert 9e7206a1cf Fix a few stylistic issues. 2016-03-14 11:29:45 -07:00
Ronny Pfannschmidt 19cec79363 Merge pull request #1451 from blueyed/fix-doc-pytest_load_initial_conftests
docs: sort arguments for pytest_load_initial_conftests
the change is purely cosmetic, but its nice to have them ordered by name
2016-03-14 14:14:22 +01:00
Ronny Pfannschmidt 0cacdef6c5 Merge pull request #1444 from novas0x2a/fixture-custom-name
Allow custom fixture names for fixtures
2016-03-14 14:08:02 +01:00
palaviv 981fcb2798 added CHANGELOG and AUTHORS entry 2016-03-13 23:47:41 +02:00
palaviv 1ee3d40dbe allow parametrized nodes to be specified from command line 2016-03-13 23:37:21 +02:00
Kale Kundert 861265411f Add "thanks" line to the CHANGELOG. 2016-03-12 22:15:19 -08:00
Daniel Hahler bdddc9c38b doc: fix argument order for pytest_load_initial_conftests 2016-03-12 17:35:27 +01:00