utest fixups
authormeejah <meejah@meejah.ca>
Thu, 8 Oct 2015 19:02:54 +0000 (13:02 -0600)
committermeejah <meejah@meejah.ca>
Mon, 26 Oct 2015 14:07:23 +0000 (08:07 -0600)
src/allmydata/test/test_magic_folder.py

index c14edc8e5ea5dc0f73a74151129922967d14b217..555900fe81c0d15dc330c47b8689989702df83ba 100644 (file)
@@ -258,16 +258,14 @@ class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqual
             with open(path, 'w') as f:
                 f.write('foo\n')
             self.notify(to_filepath(path), self.inotify.IN_CLOSE_WRITE)
-            x = yield up_proc
-            self.assertIs(x, None)  # some things "return" an Exception instead of raising it
+            yield up_proc
             self.assertTrue(os.path.exists(path))
 
             # the real test part: delete the file
             proc = self.magicfolder.uploader.set_hook('processed')
             os.unlink(path)
             self.notify(to_filepath(path), self.inotify.IN_DELETE)
-            x = yield proc
-            self.assertIs(x, None)
+            yield down_proc
             self.assertFalse(os.path.exists(path))
 
             # ensure we still have a DB entry, and that the version is 1