Merge branch '2.0' into 2.1

This commit is contained in:
Julien Duponchelle
2017-04-26 17:22:14 +02:00
37 changed files with 435 additions and 70 deletions

View File

@ -154,6 +154,7 @@ def test_termination_callback(vm, async_run):
assert event == vm
@pytest.mark.skipif(sys.platform.startswith("win"), reason="Not supported on Windows")
def test_termination_callback_error(vm, tmpdir, async_run):
with open(str(tmpdir / "qemu.log"), "w+") as f: