From: david-sarah <david-sarah@jacaranda.org>
Date: Thu, 3 Jun 2010 23:21:05 +0000 (-0700)
Subject: Fix test failures in test_web caused by changes to web page titles in #1062. Also... 
X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/file/URI:LIT:krugkidfnzsc4/@@named=?a=commitdiff_plain;h=4556702044952a79ba3c8770ab88da283b8bd615;p=tahoe-lafs%2Ftahoe-lafs.git

Fix test failures in test_web caused by changes to web page titles in #1062. Also, change a 'target' field to '_blank' instead of 'blank' in welcome.xhtml.
---

diff --git a/src/allmydata/test/test_web.py b/src/allmydata/test/test_web.py
index 7761065b..6faa4cb9 100644
--- a/src/allmydata/test/test_web.py
+++ b/src/allmydata/test/test_web.py
@@ -402,7 +402,7 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, unittest.TestCase):
     def test_provisioning(self):
         d = self.GET("/provisioning/")
         def _check(res):
-            self.failUnless('Tahoe Provisioning Tool' in res)
+            self.failUnless('Provisioning Tool' in res)
             fields = {'filled': True,
                       "num_users": int(50e3),
                       "files_per_user": 1000,
@@ -420,7 +420,7 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, unittest.TestCase):
 
         d.addCallback(_check)
         def _check2(res):
-            self.failUnless('Tahoe Provisioning Tool' in res)
+            self.failUnless('Provisioning Tool' in res)
             self.failUnless("Share space consumed: 167.01TB" in res)
 
             fields = {'filled': True,
@@ -460,7 +460,7 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, unittest.TestCase):
 
         d = self.GET("/reliability/")
         def _check(res):
-            self.failUnless('Tahoe Reliability Tool' in res)
+            self.failUnless('Reliability Tool' in res)
             fields = {'drive_lifetime': "8Y",
                       "k": "3",
                       "R": "7",
@@ -474,7 +474,7 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, unittest.TestCase):
 
         d.addCallback(_check)
         def _check2(res):
-            self.failUnless('Tahoe Reliability Tool' in res)
+            self.failUnless('Reliability Tool' in res)
             r = r'Probability of loss \(no maintenance\):\s+<span>0.033591'
             self.failUnless(re.search(r, res), res)
         d.addCallback(_check2)
diff --git a/src/allmydata/web/welcome.xhtml b/src/allmydata/web/welcome.xhtml
index 4c123f58..204f93e8 100644
--- a/src/allmydata/web/welcome.xhtml
+++ b/src/allmydata/web/welcome.xhtml
@@ -88,7 +88,7 @@
 <div class="section" id="other-resources">
   <h2>Other Resources</h2>
 
-  <div>Please visit the <a target="blank" href="http://tahoe-lafs.org">Tahoe-LAFS home page</a> for
+  <div>Please visit the <a target="_blank" href="http://tahoe-lafs.org">Tahoe-LAFS home page</a> for
   code updates and bug reporting.</div>
 
   <div>The <a href="provisioning">provisioning tool</a> and <a