From a55506f5bb83db9f7e97e2f9a5e4a98fbe7d08cf Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Thu, 7 Mar 2019 12:33:58 -0500 Subject: [PATCH 1/2] news fragment --- newsfragments/2985.minor | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 newsfragments/2985.minor diff --git a/newsfragments/2985.minor b/newsfragments/2985.minor new file mode 100644 index 000000000..e69de29bb From c42e5b10c6380cadaf5c1dace00c5de46dd18930 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Thu, 7 Mar 2019 12:38:38 -0500 Subject: [PATCH 2/2] Take the necessary fixtures --- integration/test_magic_folder.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/integration/test_magic_folder.py b/integration/test_magic_folder.py index 710372251..02f7b770a 100644 --- a/integration/test_magic_folder.py +++ b/integration/test_magic_folder.py @@ -12,9 +12,13 @@ import pytest_twisted # tests converted from check_magicfolder_smoke.py # see "conftest.py" for the fixtures (e.g. "magic_folder") -def test_eliot_logs_are_written(temp_dir): +def test_eliot_logs_are_written(alice, bob, temp_dir): # The integration test configuration arranges for this logging # configuration. Verify it actually does what we want. + # + # The alice and bob arguments looks unused but they actually tell pytest + # to set up all the magic-folder stuff. The assertions here are about + # side-effects of that setup. assert exists(join(temp_dir, "alice", "logs", "eliot.json")) assert exists(join(temp_dir, "bob", "logs", "eliot.json"))