floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add flub and pelme talks at EuroPython2014, remove one past training note

This commit is contained in:
holger krekel 2014-07-29 15:00:45 +02:00
parent 7c701948d5
commit faea7e1407
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/en/index.txt
View File

@ -3,9 +3,7 @@
.. note:: .. note::
`improving your automated testing with pytest <https://ep2014.europython.eu/en/schedule/sessions/92/>`_, July 25th 2014, Berlin, Germany next training: `professional testing with pytest and tox <http://www.python-academy.com/courses/specialtopics/python_course_testing.html>`_, 24-26th November 2014, Freiburg, Germany
`professional testing with pytest and tox <http://www.python-academy.com/courses/specialtopics/python_course_testing.html>`_, 24-26th November 2014, Freiburg, Germany
pytest: helps you write better programs pytest: helps you write better programs

8
doc/en/talks.txt
View File

@ -4,8 +4,6 @@ Talks and Tutorials
.. sidebar:: Next Open Trainings .. sidebar:: Next Open Trainings
`improving your automated testing with pytest <https://ep2014.europython.eu/en/schedule/sessions/92/>`_, July 25th 2014, Berlin, Germany
`professional testing with pytest and tox <http://www.python-academy.com/courses/specialtopics/python_course_testing.html>`_, 24-26th November 2014, Freiburg, Germany `professional testing with pytest and tox <http://www.python-academy.com/courses/specialtopics/python_course_testing.html>`_, 24-26th November 2014, Freiburg, Germany
.. _`funcargs`: funcargs.html .. _`funcargs`: funcargs.html
@ -18,6 +16,12 @@ Tutorial examples and blog postings
Basic usage and fixtures: Basic usage and fixtures:
- `Introduction to pytest by Andreas Pelme EuroPython 2014
<https://www.youtube.com/watch?v=LdVJj65ikRY>`_.
- `Advanced Uses of py.test Fixtures by Floris Bruynooghe EuroPython
2014 <https://www.youtube.com/watch?v=IBC_dxr-4ps>`_.
- `pytest feature and release highlights (GERMAN, October 2013) - `pytest feature and release highlights (GERMAN, October 2013)
<http://pyvideo.org/video/2429/pytest-feature-and-new-release-highlights>`_ <http://pyvideo.org/video/2429/pytest-feature-and-new-release-highlights>`_