summaryrefslogtreecommitdiff
path: root/doc/en/talks.txt
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2014-07-29 15:00:45 +0200
committerholger krekel <holger@merlinux.eu>2014-07-29 15:00:45 +0200
commitfaea7e1407c091513d4c5ba1f0b0101c96fad022 (patch)
tree40c1dc4970249b10395003affa3c6644409afffc /doc/en/talks.txt
parent7c701948d5529bb7c95ef996ee34978718d3edaa (diff)
downloadpytest-faea7e1407c091513d4c5ba1f0b0101c96fad022.tar.gz
add flub and pelme talks at EuroPython2014, remove one past training note
Diffstat (limited to 'doc/en/talks.txt')
-rw-r--r--doc/en/talks.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/doc/en/talks.txt b/doc/en/talks.txt
index 7e871ec52..1c40fe00e 100644
--- a/doc/en/talks.txt
+++ b/doc/en/talks.txt
@@ -4,8 +4,6 @@ Talks and Tutorials
.. 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
.. _`funcargs`: funcargs.html
@@ -18,6 +16,12 @@ Tutorial examples and blog postings
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)
<http://pyvideo.org/video/2429/pytest-feature-and-new-release-highlights>`_