From: David Stainton <dstainton415@gmail.com>
Date: Mon, 6 Jul 2015 20:10:20 +0000 (-0700)
Subject: Fix Alice Bob mock test
X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=bb6d7865dc9a2dd13b1d2581c8a6f9193967be32;p=tahoe-lafs%2Ftahoe-lafs.git

Fix Alice Bob mock test
---

diff --git a/src/allmydata/test/test_magic_folder.py b/src/allmydata/test/test_magic_folder.py
index bfd29362..f33d5f94 100644
--- a/src/allmydata/test/test_magic_folder.py
+++ b/src/allmydata/test/test_magic_folder.py
@@ -328,9 +328,11 @@ class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqual
 
         def Alice_write_a_file(result):
             print "Alice writes a file\n"
-            self.file_path = os.path.join(self.alice_magicfolder._local_dir, "file1")
+            self.file_path = abspath_expanduser_unicode(u"file1", base=self.alice_magicfolder._local_dir)
             fileutil.write(self.file_path, "meow, meow meow. meow? meow meow! meow.")
-            # XXX fix me --> self.notify(file_path, self.inotify.IN_CLOSE_WRITE)
+            self.magicfolder = self.alice_magicfolder
+            self.notify(to_filepath(self.file_path), self.inotify.IN_CLOSE_WRITE)
+
         d.addCallback(Alice_write_a_file)
 
         def Alice_wait_for_upload(result):
@@ -362,7 +364,8 @@ class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqual
         def Alice_delete_file(result):
             print "Alice deletes the file!\n"
             os.unlink(self.file_path)
-            self.notify(self.file_path, self.inotify.IN_DELETE)
+            self.notify(to_filepath(self.file_path), self.inotify.IN_DELETE)
+
             return None
         d.addCallback(Alice_delete_file)
         d.addCallback(Alice_wait_for_upload)