214793f697
re #329 add test for skipif failure when you pass boolean without the reason. add emphasize to the docs.
...
--HG--
branch : 329-skipif-requires-expression-as-a-string
2013-07-06 18:54:24 +02:00
ae327ef435
move to development doc target
2013-07-06 15:38:40 +02:00
ea4a3adfd6
- add my ep2013 talk to talks page
...
- add "talks/blogs" to the navigation side bar
2013-07-03 11:47:18 +02:00
4af052b098
added some endorsements, not quite properly layouted
2013-06-20 14:05:16 +02:00
0cfc4a49ea
adding ref targets on recwarn
2013-06-03 10:07:14 -04:00
da1996b5f5
fix issue316 - properly reference collection hooks in docs
2013-06-03 10:04:50 +02:00
c294a417bd
allow to specify parametrize inputs as a comma-separated string
...
add Wouter to changelog and to authors
2013-05-28 10:32:54 +02:00
bbc61c85ac
Merged in pfctdayelise/pytest (pull request #36 )
...
issue 308
2013-05-22 13:36:39 +02:00
f78408df77
add holger's gittip account, would also like to add ronny's
2013-05-21 16:05:32 +02:00
d8bc40271a
issue #308
...
+ docs
2013-05-21 11:12:45 +10:00
e6e86fa462
fix issue307 - use yaml.safe_load instead of yaml.load, thanks Mark Eichin.
2013-05-16 09:59:48 +02:00
150ad0172f
document context fixtures, also improve plugin docs
2013-05-07 21:37:08 +02:00
9d8645b45d
enhance index page, fix announcement index
2013-05-07 21:34:59 +02:00
bbd265184d
support boolean condition expressions in skipif/xfail
...
change documentation to prefer it over string expressions
2013-05-07 18:40:26 +02:00
331bd84ef4
change version
2013-05-05 14:23:47 +02:00
8c7ae7f7a5
release 2.3.5 packaging
2013-04-30 12:26:30 +02:00
94aa76fec0
fix reference
2013-04-04 14:36:44 +02:00
265a4de06e
doc fix: 'x' should be '-x' so it is not interpreted as a filename
2013-04-03 14:51:06 -05:00
712898cfe1
- add release announce
2013-03-28 10:21:03 +01:00
f31dc7a8b7
Attempt to improve detailed failure reporting
...
* If --verbose is used do not truncate.
* Add a special dict comparison instead of diffing
pprint output.
2013-03-28 01:39:01 +00:00
8f8466ee40
Merged in witsch/pytest/doctest-fixtures (pull request #25 )
...
fixture support in doctests
2013-03-21 12:33:43 +01:00
dfcb0e322c
rename `get_fixture` to `getfixture` to better match the current API style
...
--HG--
branch : doctest-fixtures
2013-03-21 12:04:14 +01:00
fa9bd8443f
update the documentation regarding the `get_fixture` helper
...
please note that the japanese translation was done using "google translate" and should probably be checked again... :)
--HG--
branch : doctest-fixtures
2013-03-20 17:54:38 +01:00
5ba2a7f628
Add texinfo build target to doc/*/Makefile
2013-03-10 07:25:14 +01:00
aeba66ac6a
fix typo in link
2013-02-14 14:15:13 +01:00
e007f2dc54
add note on leipzig course in june 2013
2013-02-02 20:15:01 +01:00
ee713ad036
add Brian Okken's blog post as a tutorial
2013-01-21 09:04:01 +01:00
4d4b551079
adapt locations of ML to new @python.org location
2012-12-27 16:48:17 +01:00
e13fedc256
fix pylib links
2012-12-27 16:48:14 +01:00
97f9bc2e46
fix/enhance example
2012-12-20 15:57:07 +01:00
d0bf65e6c8
adding an example on how to do interact with the list of collected tests once before any tests are run
2012-12-16 11:28:17 +01:00
8d25e52e1e
add sentry
2012-12-15 08:09:23 +01:00
6fefab0e3a
pocoo no longer has a pastebin service, so this section title is incorrect.
2012-12-11 12:04:12 -07:00
ffb5b8efa1
Fix a broken link to pytest-twisted
2012-11-22 19:59:15 +01:00
b5955c5979
fix version number, final fixes
2012-11-20 14:01:31 +01:00
765b053984
bump version, add announcement, regen docs
2012-11-20 13:42:00 +01:00
af89a9667f
add example for accessing test result information from fixture
2012-11-14 09:39:21 +01:00
d31f4dcba8
Fix typos in a document
2012-11-10 16:29:43 +09:00
d9ce7f143e
switch to pushing docs to dev, amend markers example which needs the dev candidate
2012-11-09 12:40:48 +01:00
c790490387
add an example for postprocessing a test failure
2012-11-08 23:36:16 +01:00
664b01ca42
fix misleading typo
2012-11-08 19:05:46 +01:00
ff0c75aa34
- add a Package/dir level setup example
...
- make tox.ini's doc/regen use pytest release instead of dev version
2012-11-07 11:11:40 +01:00
370f5dd5cb
fix typo
2012-11-06 15:46:52 +01:00
79f45928a4
add release announce for 2.3.3
2012-11-06 15:41:51 +01:00
65d6ebe7d1
bump to 2.3.3, add release announce
2012-11-06 14:41:10 +01:00
33cd414420
fix issue127 improve pytest_addoption docs, add new config.getoption(name) method for consistency.
2012-11-06 14:09:12 +01:00
fb173a97a8
extended - fix issue214 - ignore attribute-access errors with objects in test modules that can blow up (for example flask's request object)
2012-10-31 17:00:55 +01:00
07cc48517d
fix wrong reference in basic fixture example, thanks for reporting! ( closes #212 )
2012-10-28 14:54:49 +01:00
573599beb3
i think "helps you write better programs" fits better than "makes"
2012-10-28 11:25:53 +01:00
6ebf39e9a6
fix wrong document version on pytest.org ( closes #210 )
2012-10-28 10:13:37 +01:00
427cf6f66d
add release announce
2012-10-25 14:13:43 +02:00
6ad16936bb
bump version to 2.3.2, regen docs and changelog
2012-10-25 13:48:31 +02:00
b8277bfed8
fix issue127 - improve pytest_addoption and related documentation
2012-10-25 11:07:07 +02:00
2637326782
improve support for trial a bit more: don't run trial's empty TestCase.runTest() method
2012-10-22 19:22:01 +02:00
7e5efa0005
mention twisted with external plugins
2012-10-22 09:32:41 +02:00
d4d213f83d
some more fixes
2012-10-20 14:10:12 +02:00
289ee1c6ea
prepare a 2.3.1
2012-10-20 14:05:33 +02:00
9ed127b5da
fix issue203 - fixture functions with a scope=function should have a "self" that points to the actual instance with which the test functions run.
2012-10-20 09:59:20 +02:00
525b08bc5c
some doc refinements
2012-10-20 09:52:03 +02:00
76db624639
start new dev cycle
2012-10-19 15:01:29 +02:00
a5ce481022
final touches
2012-10-19 11:12:13 +02:00
dca5fa2241
fixing links for 2.3 release, and fixing a windows32 failure on py3
2012-10-19 10:53:28 +02:00
024df6e00b
some more finalization of docs
2012-10-19 10:07:11 +02:00
7c8755cc89
refine docs, fix a marker/keywords bit, and add a test that request.keywords points to node.keywords.
2012-10-18 15:06:55 +02:00
7d747a1cde
remove .markers attribute which was added in development and after 2.2.4
...
so never released. Rather extend keywords to also exist on nodes. Assigning
to node.keywords will make the value appear on all subchildren's
keywords.
2012-10-18 13:52:32 +02:00
dbaedbacde
many doc improvements and fixes
2012-10-18 12:24:50 +02:00
f5d796b093
improve docs further, refine unittest docs, rename ``autoactive`` to ``autouse``
...
to better match ``@pytest.mark.usefixtures`` naming.
2012-10-12 14:52:36 +02:00
0594265adc
fix output of --fixtures for @pytest.fixture defined functions.
2012-10-09 16:49:04 +02:00
fb3af07ef4
try to move docs to a more releasable state, also refine
...
release announce and a few coding bits
2012-10-09 14:35:17 +02:00
916c1c170e
somewhat simplify pytest_generate_tests example
2012-10-08 13:19:31 +02:00
df643f65f0
remove support for @pytest.fixture on classes, to be reserved for future use:
...
Fixture-classes could offer setup/teardown/addoption/configure methods
and provide higher level support. Preliminary allowing it to work on classes
may make introducing it harder.
2012-10-08 11:22:31 +02:00
30b10a6950
- fix doc references, refactor fixtures docs to more quickly start
...
with examples instead of big text blobgs
- also silence -q and -qq reporting some more
2012-10-07 13:06:17 +02:00
f588eae4f5
Use updated names
2012-10-05 22:44:18 +01:00
d8c365ef2c
implement pytest.mark.usefixtures and ini-file usefixtures setting
...
and also refine fixture docs a bit - fixtures.txt should now mostly
reflect the current state of the implementation
2012-10-05 19:20:40 +02:00
bb07ba7807
rename a number of internal and externally visible variables to use the fixture name
...
rather than funcargs. Introduce .funcargnames compatibility attribute for backward compat.
2012-10-05 14:24:44 +02:00
9251e747af
rename pytest.factory usages into pytest.fixture ones
2012-10-05 10:21:35 +02:00
439cc1238f
merge factories/funcargs and setup functions into the new "fixture" document
2012-10-05 10:21:35 +02:00
738f14a48a
improve the parametrization scenario example to sort by id, rather than by file-order, see also: http://stackoverflow.com/questions/12521924/pytest-running-scenarios-in-the-correct-order-in-the-class
2012-09-21 09:39:54 +02:00
6cb3281ddd
allow factory/setup-markers on classes, using their respective __init__ methods which can use the funcarg mechanism
2012-09-18 14:00:47 +02:00
a7c6688bd6
implement full @pytest.setup function unittest.TestCase interaction
2012-09-18 10:54:12 +02:00
c2480f5c54
fix @funcarg to @factory
2012-09-17 17:36:08 +02:00
a94bb0a8bb
introduce a new "markers" attribute to nodes and the request object. It is
...
a dynamic class making holdin
2012-09-17 17:32:23 +02:00
646c2c6001
drops special testcontext object in favour of "old" request object, simplifying communication and code for the 2.2-2.3 transition. also modify docs and examples.
2012-09-17 16:36:10 +02:00
41ad7dbae1
fix issue185 monkeypatching time.time does not cause pytest to fail
2012-09-01 09:58:10 +02:00
f07ebc6615
add talk from brianna and me from 2012
2012-08-26 16:30:01 +02:00
aa84359bd9
Merged in pfctdayelise/pytest (pull request #17 )
2012-08-16 13:23:42 +02:00
f275830ca7
expand list of projects based on URLs from holger
2012-08-16 19:31:21 +10:00
f472f21406
fix/update some docs to work with @pytest.factory instead of pytest_funcarg__ naming.
2012-08-13 12:58:08 +02:00
f4963270c6
fix typos
2012-08-11 20:02:34 +02:00
08c3b1b80f
Fix URL for waskr project
2012-08-10 15:44:58 +10:00
172505f703
fix/consolidate --junitxml=path construction with relative pathes
2012-08-04 10:33:43 +02:00
6746a00cb8
majorly refine funcargs docs and rename "resources.txt" to "funcargs.txt" so that existing web links will eventually land at this new page when pytest is released. Also integrated the detailed reasoning and update setup function docs
...
to reflect latest discussions and feedback gathered on py-dev mailing list.
2012-08-03 19:08:27 +02:00
46dc7eeacb
move pytest.mark.factory/setup to pytest.factory/setup, as per flub 's suggestion
2012-08-02 12:41:46 +02:00
ae241a5071
refine documentation, move setup to own "setup" page and provide
...
some more examples. move old setup_module/... to xunit_old page.
2012-08-02 12:07:54 +02:00
5fd84c35dd
reshuffle docs, try to get a bit closer to release-relevant documentation
2012-08-01 14:52:51 +02:00
449b55cc70
- enhance ordering of tests using parametrized resources
...
- introduce a refined way to perform finalization for setup functions
which does not use cached_setup() anymore
2012-08-01 09:07:32 +02:00
d68c65b493
minimize active parametrized non-function scoped resources by
...
- re-ordering at collection time
- modifying setup/teardown
2012-07-30 10:46:03 +02:00
fa61927c6b
introduce @pytest.mark.setup decorated function,
...
extend newexamples.txt and draft a V4 resources API doc.
2012-07-24 12:10:04 +02:00
d4a487c725
allow funcarg factories to receive funcargs
2012-07-23 10:55:09 +02:00
76584b53a1
clarify and add to sort-by-session-scoped parametrized resources example
2012-07-23 10:54:57 +02:00
6b0f0adf5b
implement a scope/parametrized examples using the so-far new features
...
also fix a bug with scoping/parametrization
2012-07-20 14:16:50 +02:00
c7ee6e71ab
re-introduce the old 2.2.4 FuncargRequest implementation as it is a better
...
base for implementing the new funcarg/setup api. Also Un-optimize
funcargnames discovery for now.
2012-07-18 19:49:14 +02:00
4766497515
V3 draft of resource api
2012-07-16 11:11:26 +02:00
38b18c44e9
ci
2012-07-18 19:48:43 +02:00
a73c27da13
DOC: typo in doc/en/goodpractices.txt ("pytest" -> "PyTest")
2012-07-18 01:01:37 -05:00
dbaf7ee9d0
v2 of resources API draft
2012-07-16 10:47:41 +02:00
7a90bed19b
V1 of the resources API draft
2012-07-16 10:47:00 +02:00
66ed2d123a
add a little example on how to group test execution by parametrized resource
2012-07-14 12:06:58 +02:00
838e758cf7
exit with errno instead of always signalling success, thanks John Anderson
2012-07-07 07:40:51 +02:00
ddd4467fdd
merge
2012-07-02 13:23:41 +02:00
5574e45749
fix issue165 - fix broken links in documentation, also point to stackoverflow from FAQ and contact page
2012-07-02 13:13:48 +02:00
91b6f2bda8
mid-scale refactoring to make request API available directly on items.
...
This commit was slightly tricky because i want to backward
compatibility especially for the oejskit plugin which
uses Funcarg-filling for non-Function objects.
2012-06-25 17:35:33 +02:00
672919a8e2
fix faq once more to get rid of the strange "missed" bit.
2012-06-18 11:47:57 +02:00
474b177da8
fix issue129 - improve http://pytest.org/latest/faq.html
...
especially with respect to the "magic" history, also mention
pytest-django, trial and unittest integration.
2012-06-17 10:59:30 +02:00
b008e489ba
fix ReST errors, increment doc-version and push to pytest.org
2012-06-11 16:24:42 +02:00
d5078001c9
Don't use deprecated API in example
2012-06-11 13:24:30 +01:00
8b3ac3b03a
also set release
2012-06-07 19:26:18 +02:00
6af20a5290
use doc-versions that can increment separately from the pytest version
2012-06-07 19:18:50 +02:00
eb1b1005ae
added an example on how to do python2/python3 customized test collection
2012-06-07 12:39:53 +02:00
6fd57ec786
extend marker section with a platform example
2012-06-06 16:34:13 +02:00
03a814a859
added Japanese translation for 2.2.4 (79a5b776a6f3)
2012-06-06 08:58:02 +09:00
b4c2161e35
fixed to find the CHANGELOG's path
2012-06-06 08:54:35 +09:00
9198069739
added "docs/en" directory and moved
2012-06-06 08:52:53 +09:00
971f96468c
fix py2py3 example tests
2012-06-03 16:10:10 +02:00
c11202b549
remove pyc file
2012-06-01 20:13:18 +02:00
42d63832b7
draft example for skipping py2 and py3 only tests on
...
a per-module level.
2012-05-23 23:40:41 +02:00
f5f3fe54d5
update examples with 2.2.4 version, ReST fixes
2012-05-22 18:30:34 +02:00
69fc6987ad
upgrade inlined distribute_setup.py
2012-05-22 17:24:43 +02:00
0790f7a75f
fix issue 144 - wrong classname in junitxml
2012-05-22 17:18:04 +02:00
91c41cd6b3
minor fix to docs/usage
2012-05-22 12:24:53 +01:00
e18abfd013
fix issue143 - call unconfigure/sessionfinish always when
...
configure/sessionstart where called
use exitcode 4 (instead of 3 which signaled an internal error)
when an initial directory/file was not found
2012-05-17 23:11:23 +02:00
329dca42a7
add release announcement
2012-05-17 15:25:58 +02:00
166aae4418
word change in the docs fixes #130
2012-03-22 08:26:37 +01:00
812ba87f37
add acomment so highlighting won\'t fail
2012-03-15 15:22:13 +01:00
2b0887fa5f
document integration with setuptools/distribute test command and tests_require
2012-03-15 15:15:21 +01:00
51d29cf4c6
mention 2.2.3 in 2.2.2 release announce
2012-02-05 23:54:20 -05:00
87b4cb283f
regen docs / examples for 2.2.2
2012-02-05 18:33:04 -05:00
83505b790d
preparing release 2.2.2
2012-02-05 17:32:01 -05:00
a756dc8106
fix issue118 - typo
2012-02-02 06:24:12 -05:00
d88fe07377
fix link to pdf from contents page
2012-01-19 20:53:21 +01:00
2e23057804
remove nonsennse part of commit related to "mp" shortcut.
...
I wonder if introducing "mp" as a shortcut to monkeypatch
is a good idea, actually :)
2012-01-06 20:40:14 +00:00
303f49a5ad
bump version, mention "mp" also in the docs and changelog
2012-01-06 20:37:18 +00:00
ccc1b21ebd
internally keep multiple applications of the same markers as separate
...
entities such that the new iter() API can iterate over pytest.mark
function attributes, getting all such applications. See added example
for more info.
2011-12-28 15:47:18 +00:00
dc0535f7d5
fix typo, thanks jurko
2011-12-20 14:12:12 +00:00
f5f8695587
add 2.2.1 announce to index
2011-12-16 12:12:23 +00:00
b83a3bcc80
mention pytest-xdist-1.8
2011-12-16 11:43:05 +00:00
3a3f69372f
regen docs, prepare release 2.2.1
2011-12-16 10:38:34 +00:00
af0edf0d10
Documentation cleanup - corrected typos & minor stylistic changes.
2011-12-05 11:10:48 +01:00
50c9e3f654
improve parametrize() docs
2011-11-19 23:45:05 +00:00
59b8ea1746
fix makeinstall
2011-11-18 21:28:14 +00:00
cf02fb60c1
isolate test example run
2011-11-18 21:26:38 +00:00
679d72eedf
fix typo in alfredo's name
2011-11-18 19:16:00 +00:00
48e6823c7a
small fix to release announcement
2011-11-18 18:45:15 +00:00
6b4e6eee09
improve release announcement, shift and fix examples a bit. Bump version to 2.2.0
2011-11-18 18:32:11 +00:00
a5e7b2760d
fix issue90 - perform teardown after its actual test function/item. This is implemented by modifying the runtestprotocol to remember "pending" teardowns and call them before the setup of the next item.
2011-11-18 16:01:29 +00:00
ec0565fac5
introduce metafunc.parametrize() and @pytest.mark.parametrize with examples. deprecate metafunc.addcall()
2011-11-17 11:09:21 +00:00
a51e52aee3
fix issue89 apply Daniel Nouri's patch to doctest/--pdb interaction.
2011-11-15 13:28:22 +00:00
9d3e51af9f
fix issue50 (add a reference to the already implemented -m) and improve release annoucnement and changelog.
2011-11-12 15:10:12 +00:00
36c42b5c15
introduce a new -m mark_expression option
2011-11-11 23:02:06 +00:00
bc8ee95e72
add ini-file "markers" option and a cmdline option "--markers" to show defined markers. Add "skipif", "xfail" etc. to the set of builtin markers shown with the --markers option.
2011-11-11 22:56:11 +00:00
67fbd24ebf
improve mark.txt document and add new regristration/markers features.
...
(welcome to documentation driven development)
2011-11-11 22:56:06 +00:00
7144cec580
avoid race condition in test, fix doc link
2011-11-08 22:06:57 +00:00
29bf205f3a
make --durations also show the execution times of setup/teardown calls. This requires a slight incompatibility - pytest_runtest_logreport now sees setup/teardown reports even if the tests passed.
2011-11-08 17:53:46 +00:00
3b9fd3abd8
introduce --durations=N showing slowest test executions
2011-11-08 17:20:56 +00:00
ae54151467
fix issue83 - add a link to already generated list of funcargs
2011-10-21 15:45:56 +02:00
448f1c0d9c
add 2.1.3 release announce to index, add floris to thanks
2011-10-18 20:58:19 +02:00
346da57a8a
bump to version 2.1.3, add release announce, regen docs (with make regen)
2011-10-18 20:07:45 +02:00
172d46abd0
add release announcement for 2.1.2
2011-09-24 08:06:39 +02:00
b490047b1c
make pip a bit more prominent now that it works on py3
2011-09-23 07:35:47 +02:00
fab7615c8a
Capitalised start of headlines, added -ing to a few headlines.
2011-09-06 11:43:42 +02:00
88c5299a94
fix announcement
2011-08-20 18:51:53 +02:00
09933b8b04
bump to 2.1.1, regen examples, add release announcement
2011-08-20 18:37:00 +02:00
fb1b1d9aae
jython-2.5.2 has a core bug preventing pytest to run :(
2011-08-19 19:25:52 +02:00
fba2079292
bump version number, refine goodpractises wrt to importing test modules
2011-08-19 07:58:50 +02:00
a70293fdb7
add ability to build pytest man page with "cd doc ; make man". Is to be
...
found in doc/_build/man/pytest.1 afterwards.
also streamline PDF generation a bit.
2011-07-14 23:13:32 +02:00
46b1348b79
merge heads
2011-07-12 17:21:48 +02:00
709da3fe84
add benjamin's post to docs, up version, open changelog
2011-07-12 10:38:02 +02:00
dd4b252749
add experimental "+1" button
2011-07-09 13:48:55 +02:00
59067684cd
switching back to pytest.org self-hosting for docs - there is too much issues where i needed/need to poke people :/
2011-07-09 13:23:58 +02:00
50c8218501
mention pypi package name
2011-07-09 12:02:22 +02:00
dc8225afea
adding release announcement
2011-07-08 13:16:32 +02:00
8713f4ba60
fix issue 35 - provide download link and improved PDF version
2011-07-08 12:42:26 +02:00
79ac8c6681
reshuffle start page as per gutworth feedback
2011-07-06 22:05:48 +02:00
418cd482b1
fix a doc link
2011-07-06 21:47:33 +02:00
df85ddf0d2
don't import py
2011-07-06 20:25:54 +02:00
e7c8fc7db9
rearrange and streamline documentation navigation to better work
...
with readthedocs and also with PDF generation.
2011-07-06 20:21:59 +02:00
46950ef19a
rename and simplify the assert option:
...
cmdline usage is now: --assert=rewrite/reinterp/plain
there is no conflict detection (don't think that's neccessary)
2011-07-05 17:29:53 +02:00
4fcd346838
update assert docs
2011-06-29 10:52:39 -05:00
f4eb15632d
refine and streamline Floris example for an assert_reprcompare hook.
2011-06-20 18:12:48 +02:00
d027f9d546
Add pytest_assertrepr_compare() docs
2011-06-20 14:18:12 +02:00
8de50347fb
some fixes and clarifications to assert docs
2011-06-18 22:30:46 +02:00
4b4a2c8162
merge heads
2011-06-18 15:09:50 -05:00
29d58ffdf2
note condition for introspection happening
2011-06-18 15:07:36 -05:00
9ea58242d4
fix getting-started which claimed you need to avoid side effect in asserts
2011-06-15 07:50:34 +02:00
8f6477f695
fix spacing
2011-06-12 16:39:38 -05:00
ce1b456762
back out pytest_configure_funcargs hook for now
2011-06-01 15:08:54 +02:00
5690beab5a
merge Benjamin's assertion-rewrite branch: all assertion related code is now part of py.test core distribution - the builtin assertion plugin to be precise.
...
See doc/assert.txt for details on how what has been improved.
2011-05-31 14:11:53 +02:00
00dee742b0
describe how assert rewriting interacts with cross test imports
2011-05-28 19:00:47 -05:00
4b7293428b
add Mozilla QA people to pytest users
2011-05-29 00:47:32 +02:00
6fdcecb864
typo
2011-05-28 16:04:36 -05:00
Anatoly Bubenkov
holger krekel
Alfredo Deza
holger krekel
Brianna Laugher
Sasha Hart
Floris Bruynooghe
Andreas Zeidler
Takafumi Arakaki
Ronny Pfannschmidt
Dusty Phillips
Wieland Hoffmann
ENDOH takanao
Brianna Laugher
Wes Turner
t2y
Jonathan Peirce
Jurko Gospodnetić
Dinu Gherman
Benjamin Peterson