diff --git a/greentest/generate_report.py b/greentest/generate_report.py index e1c8bc9..f2449ef 100755 --- a/greentest/generate_report.py +++ b/greentest/generate_report.py @@ -25,7 +25,7 @@ import os import sqlite3 import glob -REPO_URL = 'http://devel.ag-projects.com/~denis/cgi-bin/hgweb.cgi' +REPO_URL = 'http://bitbucket.org/denis/eventlet' hubs_order = ['poll', 'selects', 'libevent', 'libev', 'twistedr/selectreactor', 'twistedr/pollreactor', 'twistedr/epollreactor'] @@ -152,7 +152,7 @@ class TestResult: return '%s' % (valign, self.color(), text) def format_testname(changeset, test): - return '%s' % (REPO_URL, changeset, test, test) + return '%s' % (REPO_URL, changeset, test, test) def format_table(table, hubs, tests, hub_stats, changeset): r = '\n\n
\n' @@ -184,13 +184,19 @@ def format_table(table, hubs, tests, hub_stats, changeset): r += '
' return r -def format_header(rev, changeset): - url = '%s/log/%s' % (REPO_URL, changeset) - return 'Eventlet changeset %s: %s

' % (url, rev, changeset) +def format_header(rev, changeset, pyversion): + result = '
' + if REPO_URL is None: + result += 'Eventlet changeset %s: %s' % (rev, changeset) + else: + url = '%s/changeset/%s' % (REPO_URL, changeset) + result += 'Eventlet changeset %s: %s' % (url, rev, changeset) + result += '
Python version: %s

' % pyversion + return result -def format_html(table, rev, changeset): +def format_html(table, rev, changeset, pyversion): r = '' - r += format_header(rev, changeset) + r += format_header(rev, changeset, pyversion) r += table r += '' return r @@ -204,11 +210,11 @@ def generate_raw_results(path, database): sys.stderr.write('\n') def main(db): - full_changeset = db.split('.')[1] - rev, changeset = full_changeset.split('_', 1) + full_changeset = '.'.join(db.split('.')[1:-1]) + rev, changeset, pyversion = full_changeset.split('_') table, tests = make_table(db) hub_stats, hubs = calc_hub_stats(table) - report = format_html(format_table(table, hubs, tests, hub_stats, changeset), rev, changeset) + report = format_html(format_table(table, hubs, tests, hub_stats, changeset), rev, changeset, pyversion) path = '../htmlreports/%s' % full_changeset try: os.makedirs(path)