Changeset a18d19 in indico

Timestamp:

11/22/10 18:41:18 (3 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 4287315ec967a3da168d83963c14001db8487d53

Children:

483106

Parents:

69258c

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (11/22/10 18:09:36)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (11/22/10 18:41:18)

Message:

[FIX] ZEO Server loggin messages

• Finally the test ZEO server doesn't write on the console;
• unit tests run with --xml result in summarized output;
• functional tests output xml too;

Location:

indico/tests

Files:

• runners.py (modified) (7 diffs)
• util.py (modified) (2 diffs)

indico/tests/runners.py

@@ -145 +145 @@
 
 
+class XMLOutputOption(Option):
+
+    def use_xml_output(self, obj, fname, args):
+
+        if self.value:
+            args += ['--with-xunit', '--xunit-file=build/%s-results.xml' % fname]
+        else:
+            args += ['-v']
+
+
 class UnitTestRunner(BaseTestRunner):
     """
@@ -156 +166 @@
                       'specify': Option,
                       'log': LogToConsoleTestOption,
-                      'xml': Option}
+                      'xml': XMLOutputOption }
 
     def _run(self):
@@ -166 +176 @@
         #retrieving tests from tests folder
         args = ['nose', '--nologcapture',  '--logging-clear-handlers', \
-                '--with-id', '-v', '-s']
-
-        if self.options.valueOf('xml'):
-            args += ['--with-xunit', '--xunit-file=build/test-results.xml']
+                '--with-id', '-s']
+
+        # will set args
+        self._callOptions('use_xml_output', 'unit', args)
 
         specific = self.options.valueOf('specify')
@@ -220 +230 @@
                       'specify': Option,
                       'threads': Option,
-                      'repeat': Option}
+                      'repeat': Option,
+                      'xml': XMLOutputOption }
 
 
@@ -238 +249 @@
 
 
-            args = ['nose', '--nologcapture', '--logging-clear-handlers',
-                    '-v']
+            args = ['nose', '--nologcapture', '--logging-clear-handlers']
+
+            # will set args
+            self._callOptions('use_xml_output', 'functional', args)
 
             specific = self.options.valueOf('specify')
@@ -310 +323 @@
 
         try:
+            fout = open('build/selenium.stdout.log','w')
+            ferr = open('build/selenium.stderr.log', 'w')
+
             self.child = subprocess.Popen(["java", "-jar",
                                       os.path.join(self.setupDir,
@@ -315 +331 @@
                                                    'functional',
                                                    TestConfig.getInstance().
-                                                   getSeleniumFilename())],
-                                      stdout=None)
+                                                   getSeleniumFilename()),
+                                           '-log', 'build/selenium.log',
+                                           '-browserSideLog'],
+                                        stdout = fout,
+                                        stderr = ferr)
 
         except OSError, e:

indico/tests/util.py

@@ -24 +24 @@
 """
 
-import os, time
+import os, time, logging
 from multiprocessing import Process
 from StringIO import StringIO
 
 from ZEO.runzeo import ZEOOptions, ZEOServer
+
+
+class SilentZEOServer(ZEOServer):
+    """
+    A ZEO Server that doesn't write on the console
+    """
+    def setup_default_logging(self):
+        # do nothing, just use whatever handler is available
+        pass
 
 
@@ -39 +48 @@
         self.options = ZEOOptions()
         self.options.realize(['-f', fd, '-a', '%s:%d' % (hostname, port)])
-        self.server = ZEOServer(self.options)
+        self.server = SilentZEOServer(self.options)
 
     def run(self):