9577120592
Allow custom fixture names for fixtures
...
When defining a fixture in the same module as where it is used, the
function argument shadows the fixture name, which a) annoys pylint and
b) can lead to bugs where you forget to request a fixture into a test
method.
This allows one to define fixtures with a different name than the name
of the function, bypassing that problem.
2016-03-09 14:58:54 -08:00
c2b9196a7c
Merge remote-tracking branch 'upstream/master' into features
2016-03-02 23:41:56 -03:00
4a76b2e9b6
Merge branch 'doctest_namespace_inject' into features
2016-03-02 23:38:51 -03:00
28937a5cd9
Add versionadded directive to doctest_namespace section
2016-03-02 23:37:51 -03:00
2e02a1c370
Give proper credit for PR #1428
2016-03-02 23:30:42 -03:00
055f1dc9ea
Merge pull request #1430 from vovanbo/patch-1
...
Reformat versions and header levels in CHANGELOG file
2016-03-02 16:23:55 -03:00
0cbd58e16a
Reformat versions and header levels in CHANGELOG file
2016-03-02 22:07:30 +03:00
b7b863b7bf
Merge pull request #1429 from Zearin/patch-1
...
Minor README tweaks (markup, phrasing)
2016-03-02 15:37:12 -03:00
4bcc06362d
Minor README tweaks (markup, phrasing)
2016-03-02 11:59:04 -05:00
6dd2ff5332
Correct indentation in documentation
2016-03-02 13:02:15 +00:00
891e029518
Add a new doctest_namespace fixture
...
This fixture can be used to inject names into the namespace in which
your doctests run.
2016-03-02 12:43:57 +00:00
316e39872a
Add 2.9.1.dev1 to CHANGELOG
2016-03-01 18:55:53 -03:00
5a2500800d
Add 2.10.0.dev1 to CHANGELOG
2016-03-01 18:54:08 -03:00
c8c5a416ef
Bump version to 2.10.0.dev1
2016-03-01 18:48:13 -03:00
81af1c024a
Bump version to 2.9.1.dev1
2016-03-01 18:46:17 -03:00
e656dbb602
Merge branch 'release-290'
2016-03-01 18:45:33 -03:00
63b69326b8
Add company name to flub in sprint attendees
2016-03-01 10:17:31 +00:00
19d05814d2
Fix reference to _CallOutcome in docs
2016-02-29 17:09:31 -05:00
7d2b65813e
Fix typo in CHANGELOG
2016-02-29 16:48:28 -05:00
f82c03833f
Regendocs
2016-02-29 15:52:56 -05:00
486421fca2
Release announcement for 2.9.0
2016-02-29 15:47:23 -05:00
2d7cfcd686
Finalize CHANGELOG
2016-02-29 15:42:15 -05:00
623e786524
Bump version to 2.9.0
2016-02-29 15:39:00 -05:00
5c09b33150
Merge pull request #1423 from lukas-bednar/junit_properties
...
junit: allow multiple properties with same name
2016-02-29 15:35:03 -03:00
7e758a9dc6
junit: allow multiple properties with same name
...
It might happen that test can be affected by two or more bugs.
I need to be able to track them all.
2016-02-29 16:00:26 +01:00
3445bdaca2
Merge pull request #1418 from hackebrot/update-sprint-info
...
Add company name sprint doc
2016-02-27 19:48:36 -03:00
89151b8c63
Add company name to @hackebrot in sprint attendees
2016-02-27 22:15:07 +00:00
4194ddd5b4
Merge pull request #1417 from hackebrot/fix-docs-on-traceback-styles
...
Fix docs on traceback styles
2016-02-27 18:28:57 -03:00
ab90043adc
Update changelog with traceback style docs fix
2016-02-27 21:07:13 +00:00
a95fe3693b
Add auto to tb styles (new default since v2.6)
2016-02-27 20:54:44 +00:00
b64aaac7ec
Merge pull request #1416 from blubber/fix-mark-documentation
...
Fix a typo in the docstring for mark.MarkGenerator
2016-02-27 11:58:43 -03:00
424b46de1b
Fix a typo in the docstring for mark.MarkGenerator
2016-02-27 14:15:42 +01:00
c9927bb66f
Merge pull request #1414 from rygwdn/indexerror
...
catch IndexError exceptions when getting exception source location
2016-02-26 18:53:10 +01:00
cbb5d48fdd
Merge pull request #1413 from nicoddemus/skip-if-parametrize
...
Fix skip/xfail markers in parametrized arguments
2016-02-26 18:41:37 +01:00
d98d655094
Simplify IndexError test.
2016-02-26 08:25:49 -04:00
cf9a09e988
catch IndexError exceptions when getting exception source location
2016-02-26 08:18:12 -04:00
d9ede1bac2
Add test for unconditional skip with reason
2016-02-25 20:02:34 -03:00
5f90907509
Fix skip/xfail markers in parametrized arguments
...
Fix #1412
2016-02-25 19:13:09 -03:00
310bada6f5
Merge pull request #1409 from nicoddemus/builtin-fixtures-docs
...
Add reference to some builtin fixtures in "contents"
2016-02-25 15:46:33 -03:00
08b40396c9
Merge pull request #1400 from nicoddemus/contributing-improvements
...
Contributions to CONTRIBUTING.rst
2016-02-25 15:46:04 -03:00
a50209b29e
add some more people, and preliminary company affiliations
2016-02-25 06:50:19 +01:00
a7b907d325
Add Raphael Pierzina to AUTHORS
2016-02-23 20:29:08 -03:00
c78a8b28dc
Add reference to some builtin fixtures in "contents"
...
Fix #1408
2016-02-23 17:26:24 -03:00
3a6a0f1220
Merge pull request #1410 from milliams/master
...
Correct JUnit test invocation example
2016-02-23 08:06:21 -03:00
fc4e240596
Correct JUnit test invocation example
2016-02-23 10:05:51 +00:00
5507a4d239
Merge pull request #1405 from nicoddemus/collection-atty
...
Display collect progress only when in a terminal
2016-02-21 08:17:35 +01:00
01479189a5
Merge pull request #1406 from lwm/fix-typo
...
fix typo
2016-02-20 20:49:58 -02:00
ddb7060535
fix typo
2016-02-20 23:44:55 +01:00
96a331e32f
Display collect progress only when in a terminal
...
Fix #1397
2016-02-20 14:38:30 -02:00
688622f5cf
Code review suggestions
2016-02-19 18:27:33 -02:00
Mike Lundy
Bruno Oliveira
Vladimir Bolshakov
Zearin
Matt Williams
Floris Bruynooghe
Lukas Bednar
Raphael Pierzina
Tiemo Kieft
Florian Bruhin
Ryan Wooden
Anatoly Bubenkov
holger krekel
Matt Williams
holger krekel
Luke Murphy