Browse Source

[jobbrowser] Fix tracker page with MR1

Add a test
Remove documentation link to Oozie
Romain Rigaux 12 years ago
parent
commit
54cbd83

+ 1 - 0
apps/jobbrowser/src/jobbrowser/models.py

@@ -491,6 +491,7 @@ class Tracker(object):
     self.maxMapTasks = self.tracker.maxMapTasks
     self.maxReduceTasks = self.tracker.maxReduceTasks
     self.taskReports = self.tracker.taskReports
+    self.is_mr2 = False
 
 
 class Cluster(object):

+ 9 - 0
apps/jobbrowser/src/jobbrowser/tests.py

@@ -20,6 +20,7 @@ try:
 except ImportError:
     import simplejson as json
 import logging
+import re
 import time
 import unittest
 
@@ -353,6 +354,14 @@ class TestJobBrowserWithHadoop(unittest.TestCase, OozieServerProvider):
     response = self.client.get('/jobbrowser/jobs/?state=killed')
     assert_false(hadoop_job_id_short in response.content)
 
+    # Test tracker page
+    early_task_id = hadoop_job_id.replace('job', 'task') + '_m_000000'
+    response = self.client.get('/jobbrowser/jobs/%s/tasks/%s' % (hadoop_job_id, early_task_id))
+
+    tracker_url = re.search('<a href="(/jobbrowser/trackers/.+?)"', response.content).group(1)
+    response = self.client.get(tracker_url)
+    assert_true('Tracker at' in response.content)
+
     # Check sharing permissions
     # Login as ourself
     finish = SHARE_JOBS.set_for_testing(True)

+ 0 - 1
apps/oozie/src/oozie/templates/navigation-bar.mako

@@ -29,7 +29,6 @@
         <li class="${utils.is_selected(section, 'workflows')}"><a href="${url('oozie:list_workflows')}">${ _('Workflows') }</a></li>
         <li class="${utils.is_selected(section, 'coordinators')}"><a href="${url('oozie:list_coordinators')}">${ _('Coordinators') }</a></li>
         <li class="${utils.is_selected(section, 'bundles')}"><a href="${url('oozie:list_bundles')}">${ _('Bundles') }</a></li>
-        <li><a href="http://oozie.apache.org/docs/3.3.0/index.html" target="_blank">${ _('Documentation') }</a></li>
       </ul>
     </div>
   </div>