Merge pull request #93 from aniederl/master

execute pytest call hook only in phase 'call' (fixes issue #92)
Fix CallOrderError: Y called before Y [issue 96]

If I do something like this
x.should_receive('y').and_return(a).once().ordered()
x.should_receive('y').and_return(b).once().ordered()

then I expect the mocked method to be called twice with the same arguments
(none in this case), returning a different value the second time (b).
Before this fix, it instead resulted in a CallOrderError exception.
Merge pull request #97 from michael-db/master

Fix CallOrderError: Y called before Y [fixes issue #96]
Fix teardown in py.test on exceptions from call phase
Fix py.test failing on exceptions raised from a test