From: meejah <meejah@meejah.ca>
Date: Mon, 26 Oct 2015 14:16:19 +0000 (-0600)
Subject: setup_alice_and_bob no longer returns anything
X-Git-Url: https://git.rkrishnan.org/%5B/frontends/%22file:/rgr-080307.php?a=commitdiff_plain;h=e743ad73ce26bd5240ab28ebbe983c626890a15d;p=tahoe-lafs%2Ftahoe-lafs.git

setup_alice_and_bob no longer returns anything
---

diff --git a/src/allmydata/test/test_magic_folder.py b/src/allmydata/test/test_magic_folder.py
index f9f62cb4..9877026d 100644
--- a/src/allmydata/test/test_magic_folder.py
+++ b/src/allmydata/test/test_magic_folder.py
@@ -330,8 +330,8 @@ class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqual
         alice_clock = task.Clock()
         bob_clock = task.Clock()
         caps = yield self.setup_alice_and_bob(alice_clock, bob_clock)
-        alice_magic = caps[2]
-        bob_magic = caps[5]
+        alice_magic = self.alice_magicfolder
+        bob_magic = self.bob_magicfolder
         alice_dir = alice_magic.uploader._local_path_u
         bob_dir = bob_magic.uploader._local_path_u
         alice_fname = os.path.join(alice_dir, 'blam')