Cleanup.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

diff --git a/src/allmydata/test/test_cli_magic_folder.py b/src/allmydata/test/test_cli_magic_folder.py
index 006d12a1400eace3d48ddb9473a1b71583683328..33b8c96b6ec8180b845d4238ba1fa8b233bbdd7a 100644 (file)
--- a/src/allmydata/test/test_cli_magic_folder.py
+++ b/src/allmydata/test/test_cli_magic_folder.py
@@ -108,12 +108,9 @@ class MagicFolderTestMixin(CLITestMixin, GridTestMixin):
 
     def setup_alice_and_bob(self):
         self.set_up_grid(num_clients=2)
-        alice_dir = abspath_expanduser_unicode(u"Alice\u00F8", base=self.basedir)
-        self.mkdir_nonascii(alice_dir)
+
         alice_magic_dir = abspath_expanduser_unicode(u"Alice-magic", base=self.basedir)
         self.mkdir_nonascii(alice_magic_dir)
-        bob_dir = abspath_expanduser_unicode(u"Bob\u00F8", base=self.basedir)
-        self.mkdir_nonascii(bob_dir)
         bob_magic_dir = abspath_expanduser_unicode(u"Bob-magic", base=self.basedir)
         self.mkdir_nonascii(bob_magic_dir)
 
@@ -152,7 +149,9 @@ class MagicFolderTestMixin(CLITestMixin, GridTestMixin):
         d.addCallback(get_Bob_magicfolder)
 
         def prepare_result(result):
-            return self.alice_collective_dircap, self.alice_upload_dircap, self.alice_magicfolder, self.bob_collective_dircap, self.bob_upload_dircap, self.bob_magicfolder
+            # XXX improve this
+            return (self.alice_collective_dircap, self.alice_upload_dircap, self.alice_magicfolder,
+                    self.bob_collective_dircap,   self.bob_upload_dircap,   self.bob_magicfolder)
         d.addCallback(prepare_result)
         return d
 

diff --git a/src/allmydata/test/test_magic_folder.py b/src/allmydata/test/test_magic_folder.py
index 588a595c9c5b8439e28e921f01b8da76e6ef7136..8bd1919345380cacc213d0304e0ca772d5012b0b 100644 (file)
--- a/src/allmydata/test/test_magic_folder.py
+++ b/src/allmydata/test/test_magic_folder.py
@@ -328,8 +328,9 @@ class MagicFolderTestMixin(MagicFolderTestMixin, ShouldFailMixin, ReallyEqualMix
     def test_alice_bob(self):
         d = self.setup_alice_and_bob()
         def get_results(result):
-            # XXX
-            self.alice_collective_dir, self.alice_upload_dircap, self.alice_magicfolder, self.bob_collective_dircap, self.bob_upload_dircap, self.bob_magicfolder = result
+            # XXX are these used?
+            (self.alice_collective_dircap, self.alice_upload_dircap, self.alice_magicfolder,
+             self.bob_collective_dircap,   self.bob_upload_dircap,   self.bob_magicfolder) = result
             print "Alice magicfolderdb is at %r" % (self.alice_magicfolder._client.basedir)
             print "Bob   magicfolderdb is at %r" % (self.bob_magicfolder._client.basedir)
         d.addCallback(get_results)