From: Daira Hopwood <daira@jacaranda.org>
Date: Mon, 2 Nov 2015 22:12:09 +0000 (+0000)
Subject: Fix test_errors.
X-Git-Url: https://git.rkrishnan.org/status?a=commitdiff_plain;h=eb1afa990866ac00bee0f8f1eb44ef4f367e4454;p=tahoe-lafs%2Ftahoe-lafs.git

Fix test_errors.

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

diff --git a/src/allmydata/test/test_magic_folder.py b/src/allmydata/test/test_magic_folder.py
index 32c5c4ec..08cebd76 100644
--- a/src/allmydata/test/test_magic_folder.py
+++ b/src/allmydata/test/test_magic_folder.py
@@ -905,9 +905,8 @@ class MockTest(MagicFolderTestMixin, unittest.TestCase):
             self.shouldFail(AssertionError, 'non-directory upload.dircap', 'does not refer to a directory',
                             MagicFolder, client, 'URI:LIT:foo', '', errors_dir, magicfolderdb)
             self.shouldFail(AssertionError, 'readonly upload.dircap', 'is not a writecap to a directory',
-                            MagicFolder, client, readonly_dircap, '', errors_dir, magicfolderdb,)
-            self.shouldFail(AssertionError, 'collective dircap',
-                            "The URI in '%s' is not a readonly cap to a directory." % os.path.join('private', 'collective_dircap'),
+                            MagicFolder, client, readonly_dircap, '', errors_dir, magicfolderdb)
+            self.shouldFail(AssertionError, 'collective dircap', 'is not a readonly cap to a directory',
                             MagicFolder, client, upload_dircap, upload_dircap, errors_dir, magicfolderdb)
 
             def _not_implemented():