From 9e4fa3972e973e5c103eba1d6f0786e1329560fc Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 4 Mar 2019 10:35:34 -0500 Subject: [PATCH] Assert against the correct path magic_folder contains the magic folder paths, of course. The Tahoe-LAFS node directories are below the temp_dir. --- integration/test_magic_folder.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/integration/test_magic_folder.py b/integration/test_magic_folder.py index 3d0637262..710372251 100644 --- a/integration/test_magic_folder.py +++ b/integration/test_magic_folder.py @@ -12,12 +12,11 @@ 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(magic_folder): - alice_dir, bob_dir = magic_folder +def test_eliot_logs_are_written(temp_dir): # The integration test configuration arranges for this logging # configuration. Verify it actually does what we want. - assert exists(join(alice_dir, "logs", "eliot.json")) - assert exists(join(bob_dir, "logs", "eliot.json")) + assert exists(join(temp_dir, "alice", "logs", "eliot.json")) + assert exists(join(temp_dir, "bob", "logs", "eliot.json")) def test_alice_writes_bob_receives(magic_folder):