[Erp5-report] r42061 nicolas - /erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/

nobody at svn.erp5.org nobody at svn.erp5.org
Thu Jan 6 15:35:52 CET 2011


Author: nicolas
Date: Thu Jan  6 15:35:52 2011
New Revision: 42061

URL: http://svn.erp5.org?rev=42061&view=rev
Log:
Tests must be only started with runCloudOOoUnitTest.py .
Otherwise argument handling is messy and processes
are not well stopped.

Modified:
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testAllFormats.py
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testHighLoad.py
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMimemapper.py
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorInit.py
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorMemory.py
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorRequest.py
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorTimeout.py
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOOGranulator.py
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOOHandler.py
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOdfDocument.py
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOpenOffice.py
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testServer.py
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testUnoConverter.py
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testUnoMimemapper.py
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testXvfb.py

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testAllFormats.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testAllFormats.py?rev=42061&r1=42060&r2=42061&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testAllFormats.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testAllFormats.py [utf8] Thu Jan  6 15:35:52 2011
@@ -95,9 +95,3 @@ class TestAllFormats(CloudoooTestCase):
 def test_suite():
   return make_suite(TestAllFormats)
 
-if __name__ == "__main__":
-  import sys
-  from cloudoooTestCase import loadConfig
-  loadConfig(sys.argv[1])
-  suite = unittest.TestLoader().loadTestsFromTestCase(TestAllFormats)
-  unittest.TextTestRunner(verbosity=2).run(suite)

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testHighLoad.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testHighLoad.py?rev=42061&r1=42060&r2=42061&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testHighLoad.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testHighLoad.py [utf8] Thu Jan  6 15:35:52 2011
@@ -72,9 +72,3 @@ class TestHighLoad(CloudoooTestCase):
 def test_suite():
   return make_suite(TestHighLoad)
 
-if __name__ == "__main__":
-  import sys
-  from cloudoooTestCase import loadConfig
-  loadConfig(sys.argv[1])
-  suite = unittest.TestLoader().loadTestsFromTestCase(TestHighLoad)
-  unittest.TextTestRunner(verbosity=2).run(suite)

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMimemapper.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMimemapper.py?rev=42061&r1=42060&r2=42061&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMimemapper.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMimemapper.py [utf8] Thu Jan  6 15:35:52 2011
@@ -358,10 +358,3 @@ class TestMimeMapper(CloudoooTestCase):
 
 def test_suite():
   return make_suite(TestMimeMapper)
-
-if '__main__' == __name__:
-  from cloudoooTestCase import startFakeEnvironment, stopFakeEnvironment
-  startFakeEnvironment()
-  suite = unittest.TestLoader().loadTestsFromTestCase(TestMimeMapper)
-  unittest.TextTestRunner(verbosity=2).run(suite)
-  stopFakeEnvironment()

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorInit.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorInit.py?rev=42061&r1=42060&r2=42061&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorInit.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorInit.py [utf8] Thu Jan  6 15:35:52 2011
@@ -74,9 +74,3 @@ class TestMonitorInit(CloudoooTestCase):
 def test_suite():
   return make_suite(TestMonitorInit)
 
-if "__main__" == __name__:
-  import sys
-  from cloudoooTestCase import loadConfig
-  loadConfig(sys.argv[1])
-  suite = unittest.TestLoader().loadTestsFromTestCase(TestMonitorInit)
-  unittest.TextTestRunner(verbosity=2).run(suite)

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorMemory.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorMemory.py?rev=42061&r1=42060&r2=42061&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorMemory.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorMemory.py [utf8] Thu Jan  6 15:35:52 2011
@@ -108,9 +108,3 @@ class TestMonitorMemory(unittest.TestCas
 def test_suite():
   return make_suite(TestMonitorMemory)
 
-if "__main__" == __name__:
-  from cloudoooTestCase import startFakeEnvironment, stopFakeEnvironment
-  startFakeEnvironment()
-  suite = unittest.TestLoader().loadTestsFromTestCase(TestMonitorMemory)
-  unittest.TextTestRunner(verbosity=2).run(suite)
-  stopFakeEnvironment()

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorRequest.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorRequest.py?rev=42061&r1=42060&r2=42061&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorRequest.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorRequest.py [utf8] Thu Jan  6 15:35:52 2011
@@ -61,10 +61,3 @@ class TestMonitorRequest(CloudoooTestCas
 
 def test_suite():
   return make_suite(TestMonitorRequest)
-
-if "__main__" == __name__:
-  from cloudoooTestCase import startFakeEnvironment, stopFakeEnvironment
-  startFakeEnvironment()
-  suite = unittest.TestLoader().loadTestsFromTestCase(TestMonitorRequest)
-  unittest.TextTestRunner(verbosity=2).run(suite)
-  stopFakeEnvironment()

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorTimeout.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorTimeout.py?rev=42061&r1=42060&r2=42061&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorTimeout.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorTimeout.py [utf8] Thu Jan  6 15:35:52 2011
@@ -91,10 +91,3 @@ class TestMonitorTimeout(unittest.TestCa
 
 def test_suite():
   return make_suite(TestMonitorTimeout)
-
-if "__main__" == __name__:
-  from cloudoooTestCase import startFakeEnvironment, stopFakeEnvironment
-  startFakeEnvironment()
-  suite = unittest.TestLoader().loadTestsFromTestCase(TestMonitorTimeout)
-  unittest.TextTestRunner(verbosity=2).run(suite)
-  stopFakeEnvironment()

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOOGranulator.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOOGranulator.py?rev=42061&r1=42060&r2=42061&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOOGranulator.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOOGranulator.py [utf8] Thu Jan  6 15:35:52 2011
@@ -181,7 +181,3 @@ class TestOOGranulator(CloudoooTestCase)
 
 def test_suite():
   return make_suite(TestOOGranulator)
-
-if __name__ == "__main__":
-  suite = unittest.TestLoader().loadTestsFromTestCase(TestOOGranulator)
-  unittest.TextTestRunner(verbosity=2).run(suite)

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOOHandler.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOOHandler.py?rev=42061&r1=42060&r2=42061&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOOHandler.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOOHandler.py [utf8] Thu Jan  6 15:35:52 2011
@@ -203,9 +203,3 @@ class TestOOHandler(CloudoooTestCase):
 def test_suite():
   return make_suite(TestOOHandler)
 
-if __name__ == "__main__":
-  from cloudoooTestCase import startFakeEnvironment, stopFakeEnvironment
-  startFakeEnvironment()
-  suite = unittest.TestLoader().loadTestsFromTestCase(TestOOHandler)
-  unittest.TextTestRunner(verbosity=2).run(suite)
-  stopFakeEnvironment()

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOdfDocument.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOdfDocument.py?rev=42061&r1=42060&r2=42061&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOdfDocument.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOdfDocument.py [utf8] Thu Jan  6 15:35:52 2011
@@ -67,6 +67,3 @@ class TestOdfDocument(CloudoooTestCase):
 def test_suite():
   return make_suite(TestOdfDocument)
 
-if __name__ == "__main__":
-  suite = unittest.TestLoader().loadTestsFromTestCase(TestOdfDocument)
-  unittest.TextTestRunner(verbosity=2).run(suite)

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOpenOffice.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOpenOffice.py?rev=42061&r1=42060&r2=42061&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOpenOffice.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOpenOffice.py [utf8] Thu Jan  6 15:35:52 2011
@@ -117,10 +117,3 @@ class TestOpenOffice(CloudoooTestCase):
 
 def test_suite():
   return make_suite(TestOpenOffice)
-
-if __name__ == "__main__":
-  from cloudoooTestCase import startFakeEnvironment, stopFakeEnvironment
-  startFakeEnvironment(False)
-  suite = unittest.TestLoader().loadTestsFromTestCase(TestOpenOffice)
-  unittest.TextTestRunner(verbosity=2).run(suite)
-  stopFakeEnvironment()

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testServer.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testServer.py?rev=42061&r1=42060&r2=42061&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testServer.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testServer.py [utf8] Thu Jan  6 15:35:52 2011
@@ -532,10 +532,4 @@ class TestServer(CloudoooTestCase):
 
 def test_suite():
   return make_suite(TestServer)
-  
-if __name__ == "__main__":
-  import sys
-  from cloudoooTestCase import loadConfig
-  loadConfig(sys.argv[1])
-  suite = unittest.TestLoader().loadTestsFromTestCase(TestServer)
-  unittest.TextTestRunner(verbosity=2).run(suite)
+

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testUnoConverter.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testUnoConverter.py?rev=42061&r1=42060&r2=42061&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testUnoConverter.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testUnoConverter.py [utf8] Thu Jan  6 15:35:52 2011
@@ -91,10 +91,3 @@ class TestUnoConverter(CloudoooTestCase)
 
 def test_suite():
   return make_suite(TestUnoConverter)
-
-if __name__ == "__main__":
-  from cloudoooTestCase import startFakeEnvironment, stopFakeEnvironment
-  startFakeEnvironment()
-  suite = unittest.TestLoader().loadTestsFromTestCase(TestUnoConverter)
-  unittest.TextTestRunner(verbosity=2).run(suite)
-  stopFakeEnvironment()

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testUnoMimemapper.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testUnoMimemapper.py?rev=42061&r1=42060&r2=42061&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testUnoMimemapper.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testUnoMimemapper.py [utf8] Thu Jan  6 15:35:52 2011
@@ -116,9 +116,3 @@ class TestUnoMimeMapper(CloudoooTestCase
 def test_suite():
   return make_suite(TestUnoMimeMapper)
 
-if __name__ == "__main__":
-  from cloudoooTestCase import startFakeEnvironment, stopFakeEnvironment
-  startFakeEnvironment()
-  suite = unittest.TestLoader().loadTestsFromTestCase(TestUnoMimeMapper)
-  unittest.TextTestRunner(verbosity=2).run(suite)
-  stopFakeEnvironment()

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testXvfb.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testXvfb.py?rev=42061&r1=42060&r2=42061&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testXvfb.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testXvfb.py [utf8] Thu Jan  6 15:35:52 2011
@@ -68,9 +68,3 @@ class TestXvfb(CloudoooTestCase):
 def test_suite():
   return make_suite(TestXvfb)
 
-if "__main__" == __name__:
-  import sys
-  from cloudoooTestCase import loadConfig
-  loadConfig(sys.argv[1])
-  suite = unittest.TestLoader().loadTestsFromTestCase(TestXvfb)
-  unittest.TextTestRunner(verbosity=2).run(suite)



More information about the Erp5-report mailing list