projects
/
tahoe-lafs
/
tahoe-lafs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c77c52f
)
setup_alice_and_bob no longer returns anything
author
meejah
<meejah@meejah.ca>
Mon, 26 Oct 2015 14:16:19 +0000
(08:16 -0600)
committer
meejah
<meejah@meejah.ca>
Mon, 26 Oct 2015 14:16:19 +0000
(08:16 -0600)
src/allmydata/test/test_magic_folder.py
patch
|
blob
|
history
diff --git
a/src/allmydata/test/test_magic_folder.py
b/src/allmydata/test/test_magic_folder.py
index f9f62cb489cdb2fb4ab41a053f1d956a68659178..9877026d4d89dea3b7e0d2bb6c0ce891dcb442e0 100644
(file)
--- 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')