From: meejah <meejah@meejah.ca>
Date: Thu, 8 Oct 2015 19:02:54 +0000 (-0600)
Subject: utest fixups
X-Git-Url: https://git.rkrishnan.org/simplejson/$rel_link?a=commitdiff_plain;h=80c25e6806e8154b6e03b123f1cf12cc0214d53b;p=tahoe-lafs%2Ftahoe-lafs.git

utest fixups
---

diff --git a/src/allmydata/test/test_magic_folder.py b/src/allmydata/test/test_magic_folder.py
index c14edc8e..555900fe 100644
--- a/src/allmydata/test/test_magic_folder.py
+++ b/src/allmydata/test/test_magic_folder.py
@@ -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