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 61e8d87b46263454dffff34b71db865f42e1021c..4a5c6f4ebddfb78f6871173c81fe4828e0b59008 100644 (file)
--- 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 38e6dacbcb0798ee58ca5e3609d242389a2b4d84..06d9b08be3a4443140f18733be27af2f20812949 100644 (file)
--- 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" />