clean up the tests

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk/utils@42190 20353a03-c40f-0410-a6d1-a30d3c3de9de

cloudooo/handler/ooo/tests/runCloudOOoUnitTest.py

@@ -4,12 +4,11 @@ import sys
 import unittest
 from argparse import ArgumentParser
 from time import sleep
+from subprocess import Popen
 from cloudooo.handler.ooo.utils.utils import socketStatus
 from ConfigParser import ConfigParser
 from os import chdir, path, environ, curdir
-from subprocess import Popen, PIPE
 import tempfile
-import os
 
 ENVIRONMENT_PATH = path.abspath(path.dirname(__file__))
 
@@ -66,11 +65,8 @@ def run():
   config = ConfigParser()
   config.read(server_cloudooo_conf)
   openoffice_port = int(config.get("app:main", "openoffice_port"))
-  xvfb_port = int(config.get("app:main", "virtual_display_port"))
-  xvfb_display_id = int(config.get("app:main", "virtual_display_id"))
   hostname = config.get("app:main", "application_hostname")
   server_port = int(config.get("server:main", "port"))
-  run_dir = config.get('app:main', 'working_path')
   module = __import__(test_name)
   if not hasattr(module, "test_suite"):
     exit("No test suite to run, exiting immediately")
@@ -109,8 +105,8 @@ def run():
       stopFakeEnvironment()
   elif XVFB:
     chdir(ENVIRONMENT_PATH)
-    xvfb = startFakeEnvironment(start_openoffice=False,
-                                conf_path=server_cloudooo_conf)
+    startFakeEnvironment(start_openoffice=False,
+                         conf_path=server_cloudooo_conf)
     try:
       TestRunner(verbosity=2).run(suite)
     finally:

cloudooo/handler/ooo/tests/testFilter.py

@@ -57,6 +57,3 @@ class TestFilter(unittest.TestCase):
 def test_suite():
   return make_suite(TestFilter)
 
-if __name__ == "__main__":
-  suite = unittest.TestLoader().loadTestsFromTestCase(TestFilter)
-  unittest.TextTestRunner(verbosity=2).run(suite)

cloudooo/handler/ooo/tests/testHighLoad.py

@@ -26,9 +26,6 @@
 #
 ##############################################################################
 
-import unittest
-import os
-import subprocess
 from xmlrpclib import ServerProxy
 from base64 import encodestring, decodestring
 from multiprocessing import Process, Array

cloudooo/handler/ooo/tests/testMonitorInit.py

@@ -26,7 +26,6 @@
 #
 ##############################################################################
 
-import unittest
 import cloudooo.handler.ooo.monitor as monitor
 from cloudoooTestCase import CloudoooTestCase, make_suite
 from cloudooo.handler.ooo.monitor.request import MonitorRequest

cloudooo/handler/ooo/tests/testOOGranulator.py

@@ -27,7 +27,6 @@
 #
 ##############################################################################
 
-import unittest
 from zipfile import ZipFile
 from StringIO import StringIO
 from lxml import etree

cloudooo/handler/ooo/tests/testUnoMimemapper.py

@@ -26,7 +26,6 @@
 #
 ##############################################################################
 
-import unittest
 import json
 import pkg_resources
 from cloudooo.handler.ooo.application.openoffice import openoffice