[SCM] build.samba.org - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  1d36022 Kill a global.
      from  1a6118b Support overriding cache page on command line for web/build.py Put pages into a separate class. Several other fixes.

http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1d3602271d3b5898b46b2c3890a98ac8d92559b6
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Nov 13 14:08:19 2010 +0100

    Kill a global.

-----------------------------------------------------------------------

Summary of changes:
 web/build.py |   97 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 49 insertions(+), 48 deletions(-)


Changeset truncated at 500 lines:

diff --git a/web/build.py b/web/build.py
index f8d74d5..d933554 100755
--- a/web/build.py
+++ b/web/build.py
@@ -163,14 +163,12 @@ def format_subunit_reason(reason):
     return "<div class=\"reason\">%s</div>" % reason
 
 
-def print_log_pretty(log):
-    # prints the log in a visually appealing manner
-    global indice
-    indice = 0
+class LogPrettyPrinter(object):
+
+    def __init__(self):
+        self.indice = 0
 
-    # do some pretty printing for the actions
-    def pretty_print(m):
-        global indice
+    def _pretty_print(self, m):
         output = m.group(1)
         actionName = m.group(2)
         status = m.group(3)
@@ -178,37 +176,19 @@ def print_log_pretty(log):
         if actionName == 'cc_checker':
              output = print_log_cc_checker(output)
 
-        indice += 1
-        return make_collapsible_html('action', actionName, output, indice, status)
-
-    pattern = re.compile("(Running action\s+([\w\-]+)$(?:\s^.*$)*?\sACTION\ (PASSED|FAILED):\ ([\w\-]+)$)", re.M)
-    log = pattern.sub(pretty_print, log)
+        self.indice += 1
+        return make_collapsible_html('action', actionName, output, self.indice, status)
 
     # log is already CGI-escaped, so handle '>' in test name by handling &gt
-    def format_stage(m):
-        indice += 1
-        return make_collapsible_html('test', m.group(1), m.group(2), indice, m.group(3))
-
-    log = re.sub("""
-          --==--==--==--==--==--==--==--==--==--==--.*?
-          Running\ test\ ([\w\-=,_:\ /.&;]+).*?
-          --==--==--==--==--==--==--==--==--==--==--
-              (.*?)
-          ==========================================.*?
-          TEST\ (FAILED|PASSED|SKIPPED):.*?
-          ==========================================\s+
-        """, format_stage, log)
+    def _format_stage(self, m):
+        self.indice += 1
+        return make_collapsible_html('test', m.group(1), m.group(2), self.indice, m.group(3))
 
-    def format_skip_testsuite(m):
-        global indice
-        indice += 1
-        return make_collapsible_html('test', m.group(1), '', indice, 'skipped')
+    def _format_skip_testsuite(self, m):
+        self.indice += 1
+        return make_collapsible_html('test', m.group(1), '', self.indice, 'skipped')
 
-    log = re.sub("skip-testsuite: ([\w\-=,_:\ /.&; \(\)]+).*?",
-            format_skip_testsuite, log)
-
-    def format_testsuite(m):
-        global indice
+    def _format_testsuite(self, m):
         testName = m.group(1)
         content = m.group(2)
         status = subunit_to_buildfarm_result(m.group(3))
@@ -216,23 +196,44 @@ def print_log_pretty(log):
             errorReason = format_subunit_reason(m.group(4))
         else:
             errorReason = ""
-        indice += 1
-        return make_collapsible_html('test', testName, content+errorReason, indice, status)
-
-    pattern = re.compile("^testsuite: (.+)$\s((?:^.*$\s)*?)testsuite-(\w+): .*?(?:(\[$\s(?:^.*$\s)*?^\]$)|$)", re.M)
-    log = pattern.sub(format_testsuite, log)
+        self.indice += 1
+        return make_collapsible_html('test', testName, content+errorReason, self.indice, status)
+
+    def _format_test(self, m):
+        self.indice += 1
+        return make_collapsible_html('test', m.group(1), m.group(2)+format_subunit_reason(m.group(4)), self.indice, subunit_to_buildfarm_result(m.group(3)))
+
+    def pretty_print(self, log):
+        # do some pretty printing for the actions
+        pattern = re.compile("(Running action\s+([\w\-]+)$(?:\s^.*$)*?\sACTION\ (PASSED|FAILED):\ ([\w\-]+)$)", re.M)
+        log = pattern.sub(self._pretty_print, log)
+
+        log = re.sub("""
+              --==--==--==--==--==--==--==--==--==--==--.*?
+              Running\ test\ ([\w\-=,_:\ /.&;]+).*?
+              --==--==--==--==--==--==--==--==--==--==--
+                  (.*?)
+              ==========================================.*?
+              TEST\ (FAILED|PASSED|SKIPPED):.*?
+              ==========================================\s+
+            """, self._format_stage, log)
+
+        log = re.sub("skip-testsuite: ([\w\-=,_:\ /.&; \(\)]+).*?",
+                self._format_skip_testsuite, log)
+
+        pattern = re.compile("^testsuite: (.+)$\s((?:^.*$\s)*?)testsuite-(\w+): .*?(?:(\[$\s(?:^.*$\s)*?^\]$)|$)", re.M)
+        log = pattern.sub(self._format_testsuite, log)
+        log = re.sub("""
+              ^test: ([\w\-=,_:\ /.&; \(\)]+).*?
+              (.*?)
+              (success|xfail|failure|skip): [\w\-=,_:\ /.&; \(\)]+( \[.*?\])?.*?
+           """, self._format_test, log)
 
-    def format_test(m):
-        id += 1
-        return make_collapsible_html('test', m.group(1), m.group(2)+format_subunit_reason(m.group(4)), id, subunit_to_buildfarm_result(m.group(3)))
+        return "<pre>%s</pre>" % log
 
-    log = re.sub("""
-          ^test: ([\w\-=,_:\ /.&; \(\)]+).*?
-          (.*?)
-          (success|xfail|failure|skip): [\w\-=,_:\ /.&; \(\)]+( \[.*?\])?.*?
-       """, format_test, log)
 
-    return "<pre>%s</pre>" % log
+def print_log_pretty(log):
+    return LogPrettyPrinter().pretty_print(log)
 
 
 def print_log_cc_checker(input):


-- 
build.samba.org