fix unit tests to assert that we do *not* link to start.html when there is no private...

diff --git a/docs/configuration.txt b/docs/configuration.txt
index ddce76faf409bd6b44203c120aa6b937be1e5123..4686663d7cfe721aecd779df22b4078de33a3da3 100644 (file)
--- a/docs/configuration.txt
+++ b/docs/configuration.txt
@@ -63,7 +63,7 @@ possibly more reliable) limit, use a symlink to place the 'storage/'
 directory on a separate size-limited filesystem, and/or use per-user
 OS/filesystem quotas.
 
-my_private_dir.uri (optional): When you create a new tahoe client, this
+my_private_dir.cap (optional): When you create a new tahoe client, this
 file is created with no contents (as an empty file).  When the node starts
 up, it will inspect this file.  If the file doesn't exist then nothing will
 be done.  If the file exists, then the node will try to read the contents of

diff --git a/src/allmydata/test/test_web.py b/src/allmydata/test/test_web.py
index c878383e16ccafc627bdb5133f70b2892b3fc533..2cc6c7971232840f06055f597aec907803ab1de5 100644 (file)
--- a/src/allmydata/test/test_web.py
+++ b/src/allmydata/test/test_web.py
@@ -258,10 +258,11 @@ class Web(WebMixin, unittest.TestCase):
             return self.GET("/")
         d.addCallback(_check)
         def _check2(res):
-            self.failUnless('To view your personal private non-shared' in res)
-            self.failUnless('from your local filesystem:' in res)
-            self.failUnless(os.path.abspath('web/test_welcome/private/start.html')
-                            in res)
+            # We shouldn't link to the start.html page since we don't have a 
+            # private directory cap.
+            self.failIf('To view your personal private non-shared' in res)
+            self.failIf('from your local filesystem:' in res)
+            self.failIf(os.path.abspath('web/test_welcome/private/start.html') in res)
         d.addCallback(_check2)
         return d