Fix up the owners field mess in tko parsing - it can be None
Signed-off-by: Martin J. Bligh <mbligh@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@1080 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/tko/display.py b/tko/display.py
index 7da6e6f..0839599 100755
--- a/tko/display.py
+++ b/tko/display.py
@@ -149,9 +149,5 @@
name = re.sub('_', '<br>', group.name)
if re.search('/', name):
(owner, machine) = name.split('/', 1)
- if len(owner) > 3: # capitalize acroymns
- owner = owner.capitalize()
- else:
- owner = owner.upper()
name = owner + '<br>' + machine
return name
diff --git a/tko/frontend.py b/tko/frontend.py
index 0f85607..7b610a4 100755
--- a/tko/frontend.py
+++ b/tko/frontend.py
@@ -152,14 +152,7 @@
self.idx = idx
self.hostname = hostname
self.group = group
- if owner:
- if len(owner) > 3:
- self.owner = owner.capitalize()
- else:
- # capitalize acroymns
- self.owner = owner.upper()
- else:
- self.owner = None
+ self.owner = owner
class kernel:
diff --git a/tko/machine_kernel_test.cgi b/tko/machine_kernel_test.cgi
index e3f299e..25f6a38 100755
--- a/tko/machine_kernel_test.cgi
+++ b/tko/machine_kernel_test.cgi
@@ -59,13 +59,21 @@
header_row = [ display.box('Version', header=True) ]
for test in [re.sub(r'kernel.', r'kernel<br>', x) for x in test_list]:
- header_row.append( display.box(test, link='machine_kernel_test_jobs.cgi?machine=%s&kernel=%s&test=%s' % (mlist, kernel.idx, test), header=True))
+ url='machine_kernel_test_jobs.cgi?machine=%s&kernel=%s&test=%s'\
+ % (mlist, kernel.idx, test)
+ header_row.append( display.box(test, link=url, header=True) )
matrix = [header_row]
for machine in machines:
if not results.has_key(machine.idx):
continue
- row = [display.box(machine.owner + ' ' + machine.hostname, link='machine_kernel_test_jobs.cgi?machine=%s&kernel=%s' % (machine.idx, kernel.idx))]
+ if machine.owner:
+ hostname = machine.owner + ' ' + machine.hostname
+ else:
+ hostname = machine.hostname
+ url = 'machine_kernel_test_jobs.cgi?machine=%s&kernel=%s' % \
+ (machine.idx, kernel.idx)
+ row = [display.box(hostname, link = url)]
for testname in test_list:
if results[machine.idx].has_key(testname):
tests = results[machine.idx][testname]