aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* copy upstream pytest-2.9.2 and py-1.4.29Ronan Lamy2016-11-156-991/+772
* sync to pytest 2.5.2 and pylib 1.4.20Ronan Lamy2014-04-126-161/+319
* apply patch from upstream that fixes armins py25 issueRonny Pfannschmidt2012-04-133-4/+3
* upgrade py and _pytest to current tipRonny Pfannschmidt2012-04-091-1/+0
* syncronize pylib and pytest with current hg versionsRonny Pfannschmidt2012-01-214-121/+370
* update py.test again (now with 2.5 support)Benjamin Peterson2011-06-146-0/+1614
* Backout changes 3c0ae7fce1c7 to cfbda2605f9dArmin Rigo2011-06-146-1614/+0
* upgrade to latest development version of py.testBenjamin Peterson2011-06-136-0/+1614