From 8cefb7a68047a9dd83249b92e7283987ffbd6f9a Mon Sep 17 00:00:00 2001 From: David Stainton Date: Mon, 6 Jul 2015 13:10:20 -0700 Subject: [PATCH] Fix Alice Bob mock test --- src/allmydata/test/test_magic_folder.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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) -- 2.45.2