pytest in trunk

[Stefan Eissing via dev]

...is no longer working for me since r1908574 by Yann.

Yann, you changed the cgi implementations. Some do no even run on my machine 
due to wrong var names. What was the idea behind the changes? I assume they are 
working on your system?