Render https producers as HTML hyperlinks too.

[cmatthews]

Since there is already a regex here, how about using a capture group on the protocol as well, then placing it back on the generated URL?

[fhahn]

Thanks! I will update this patch when I am back, at the end of next week.

[fhahn]

Update to check for https in buildbot URL too and add tests with https urls.

[fhahn]

ping

[cmatthews]

Thx

lnt/trunk/lnt/server/ui/util.py

 def sorted(values, *args, **kwargs):
     values = list(values)
     values.sort(*args, **kwargs)
     return values
 
 
 def renderProducerAsHTML(producer):
     # If the string looks like a buildbot link, render it prettily.
-    m = re.match(r'http://(.*)/builders/(.*)/builds/(\d+)', producer)
+    m = re.match(r'(https?)://(.*)/builders/(.*)/builds/(\d+)', producer)
     if m:
-        url = m.group(1)
-        builder = m.group(2)
-        build = m.group(3)
+        protocol = m.group(1)
+        url = m.group(2)
+        builder = m.group(3)
+        build = m.group(4)
 
         png_url = \
-            'http://%(url)s/png?builder=%(builder)s&number=%(build)s' % \
-            locals()
+            '%(protocol)s://%(url)s/png?builder=%(builder)s&' \
+            'number=%(build)s' % locals()
         img = '<img src="%(png_url)s" />' % locals()
         return '<a href="%(producer)s">%(builder)s #%(build)s %(img)s</a>' % \
             locals()
 
-    elif producer.startswith('http://'):
+    elif re.search(r'^https?://.+', producer):
         return '<a href="' + producer + '">Producer</a>'
 
     else:
         return producer
 
 
 FLASH_DANGER = "alert alert-danger"
 FLASH_INFO = "alert alert-info"

lnt/trunk/tests/server/ui/Inputs/V4Pages_extra_records.sql

 INSERT INTO "NT_Run" ("MachineID", "OrderID", "ImportedFrom", "StartTime",
                       "EndTime", "SimpleRunID", "Parameters")
  VALUES(2,6,'run7.json','2012-05-10 16:28:23.000000',
         '2012-05-10 16:28:58.000000',NULL,
         '[["producer", "http://my.build.server/buildResult"]]'); -- ID 7
 INSERT INTO "NT_Run" ("MachineID", "OrderID", "ImportedFrom", "StartTime",
                       "EndTime", "SimpleRunID", "Parameters")
  VALUES(2,7,'run8.json','2012-05-11 16:28:23.000000',
-        '2012-05-11 16:28:58.000000',NULL,'[]'); -- ID 8
+        '2012-05-11 16:28:58.000000',NULL,
+        '[["producer", "https://my.build.server/buildResult"]]'); -- ID 8
 INSERT INTO "NT_Run" ("MachineID", "OrderID", "ImportedFrom", "StartTime",
                       "EndTime", "SimpleRunID", "Parameters")
  VALUES(2,8,'run9.json','2012-05-12 16:28:23.000000',
-        '2012-05-12 16:28:58.000000',NULL,'[]'); -- ID 9
+        '2012-05-12 16:28:58.000000',NULL,
+        '[["producer", "https://buildbot.server.url/builders/some-builder/builds/999"]]'); -- ID 9
 INSERT INTO "NT_Sample" ("RunID", "TestID", "compile_status",
                          "execution_status", "compile_time", "execution_time",
                          "score", "mem_bytes")
  VALUES(7,6,0,0,0.001,1.0,NULL,NULL); -- ID 9: passing result
 INSERT INTO "NT_Sample" ("RunID", "TestID", "compile_status",
                          "execution_status", "compile_time", "execution_time",
                          "score", "mem_bytes")
  VALUES(8,6,0,1,0.001,1.0,NULL,NULL); -- ID 10: failing result

lnt/trunk/tests/server/ui/V4Pages.py

def main():
     # Get a graph page. This has been changed to redirect.
     check_redirect(client, '/v4/nts/1/graph?test.3=2',
                    'v4/nts/graph\?plot\.0=1\.3\.2&highlight_run=1$')
 
     # Get a run that contains generic producer information
     check_producer_label(client, '/v4/nts/7',
                          ['Current', '152293', '2012-05-10T16:28:23',
                           '0:00:35', 'Producer'])
+    check_producer_label(client, '/v4/nts/8',
+                         ['Current', '152294', '2012-05-11T16:28:23',
+                          '0:00:35', 'Producer'])
 
     # Get a run that contains Buildbot producer information
     check_producer_label(client, '/v4/nts/7',
                          ['Previous', '152292', '2012-05-01T16:28:23',
                           '0:00:35', 'some-builder #987'])
+    check_producer_label(client, '/v4/nts/9',
+                         ['Current', '152295', '2012-05-12T16:28:23',
+                          '0:00:35', 'some-builder #999'])
 
     # Get the new graph page.
     check_html(client, '/v4/nts/graph?plot.0=1.3.2')
     # Don't crash when requesting non-existing data
     check_html(client, '/v4/nts/graph?plot.9999=1.3.2')
     check_code(client, '/v4/nts/graph?plot.0=9999.3.2',
                expected_code=HTTP_NOT_FOUND)
     check_code(client, '/v4/nts/graph?plot.0=1.9999.2',