fix issue 93 of pytest - avoid delayed teardowns

2011-12-02 21:03:29 +00:00
parent d5ff8b066a
commit 1f6d410481
9 changed files with 40 additions and 24 deletions
--- a/testing/test_remote.py
+++ b/testing/test_remote.py
@@ -138,6 +138,7 @@ class TestSlaveInteractor:
        ids = ev.kwargs['ids']
        assert len(ids) == 1
        slave.sendcommand("runtests", ids=ids)
+        slave.sendcommand("shutdown")
        ev = slave.popevent("testreport") # setup
        ev = slave.popevent("testreport")
        assert ev.name == "testreport"
@@ -145,7 +146,6 @@ class TestSlaveInteractor:
        assert rep.nodeid.endswith("::test_func")
        assert rep.passed
        assert rep.when == "call"
-        slave.sendcommand("shutdown")
        ev = slave.popevent("slavefinished")
        assert 'slaveoutput' in ev.kwargs