From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 5 Sep 2013 16:47:42 +0000 (+0100)
Subject: Fri Jun  8 23:21:46 BST 2012  Brian Warner <warner@lothar.com>
X-Git-Url: https://git.rkrishnan.org/components/com_hotproperty/simplejson/cyclelanguage?a=commitdiff_plain;h=e22c8c57fd058b6440ae0e9870336f8b3cb4058b;p=tahoe-lafs%2Ftahoe-lafs.git

Fri Jun  8 23:21:46 BST 2012  Brian Warner <warner@lothar.com>
  * Fix text in Publish Status results. Closes #1762.
---

diff --git a/src/allmydata/test/test_system.py b/src/allmydata/test/test_system.py
index 61e8d87b..4a5c6f4e 100644
--- a/src/allmydata/test/test_system.py
+++ b/src/allmydata/test/test_system.py
@@ -1220,8 +1220,12 @@ class SystemTest(SystemTestMixin, RunBinTahoeMixin, unittest.TestCase):
             return self.GET("status/publish-%d" % self._publish_status)
         d.addCallback(_got_update)
         def _got_publish(res):
+            self.failUnlessIn("Publish Results", res)
             return self.GET("status/retrieve-%d" % self._retrieve_status)
         d.addCallback(_got_publish)
+        def _got_retrieve(res):
+            self.failUnlessIn("Retrieve Results", res)
+        d.addCallback(_got_retrieve)
 
         # check that the helper status page exists
         d.addCallback(lambda res:
diff --git a/src/allmydata/web/publish-status.xhtml b/src/allmydata/web/publish-status.xhtml
index 38e6dacb..06d9b08b 100644
--- a/src/allmydata/web/publish-status.xhtml
+++ b/src/allmydata/web/publish-status.xhtml
@@ -18,7 +18,7 @@
   <li>Status: <span n:render="status"/></li>
 </ul>
 
-<h2>Retrieve Results</h2>
+<h2>Publish Results</h2>
 <ul>
   <li n:render="encoding" />
   <li n:render="problems" />