[Erp5-report] r15157 - /erp5/trunk/utils/oood/
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Jul 5 15:41:44 CEST 2007
Author: bartek
Date: Thu Jul 5 15:41:42 2007
New Revision: 15157
URL: http://svn.erp5.org?rev=15157&view=rev
Log:
Patch to allow using arbitraty ports for testing, so that offsets and multi-oood can be tested too.
Modified:
erp5/trunk/utils/oood/testOoodAllFormatsSupport.py
erp5/trunk/utils/oood/testOoodBasicOperations.py
erp5/trunk/utils/oood/testOoodHighLoad.py
erp5/trunk/utils/oood/testOoodOldFormats.py
Modified: erp5/trunk/utils/oood/testOoodAllFormatsSupport.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/testOoodAllFormatsSupport.py?rev=15157&r1=15156&r2=15157&view=diff
==============================================================================
--- erp5/trunk/utils/oood/testOoodAllFormatsSupport.py (original)
+++ erp5/trunk/utils/oood/testOoodAllFormatsSupport.py Thu Jul 5 15:41:42 2007
@@ -33,6 +33,7 @@
"""
import sys, base64, unittest
+import getopt
from xmlrpclib import *
import config
from oood_common import responseFactory, Request
@@ -46,7 +47,39 @@
print "you need a doc subdir with appropriate documents"
sys.exit(1)
-sp = ServerProxy('http://%s:%d' % (config.server_host, config.server_port))
+opts, args = getopt.getopt(sys.argv[1:], '', ["offset=", "port=", "host="])
+
+port = None
+host = None
+
+offset_str = ''
+offset = 0
+
+for o, a in opts:
+ if o == '--offset':
+ offset_str = a
+ offset = int(a)
+ elif o == '--port':
+ port = int(a)
+ elif o == '--host':
+ host = a
+
+doc_dir = 'doc%s' % offset_str
+
+if not port:
+ port = config.server_port + offset
+ print port
+if not host:
+ host = config.server_host
+ print host
+
+try:
+ f = open('%s/test.odt' % doc_dir)
+except IOError:
+ print "you need a %s subdir with appropriate documents" % doc_dir
+ sys.exit(1)
+
+sp = ServerProxy('http://%s:%d' % (host, port))
class TestFormats(unittest.TestCase):
Modified: erp5/trunk/utils/oood/testOoodBasicOperations.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/testOoodBasicOperations.py?rev=15157&r1=15156&r2=15157&view=diff
==============================================================================
--- erp5/trunk/utils/oood/testOoodBasicOperations.py (original)
+++ erp5/trunk/utils/oood/testOoodBasicOperations.py Thu Jul 5 15:41:42 2007
@@ -34,6 +34,7 @@
"""
import sys, base64, unittest
+import getopt
import re
from xmlrpclib import *
import config
@@ -41,14 +42,31 @@
enc = base64.encodestring
-if len(sys.argv)>1:
- offset_str = sys.argv[1]
- offset=int(offset_str)
-else:
- offset_str=''
- offset = 0
+opts, args = getopt.getopt(sys.argv[1:], '', ["offset=", "port=", "host="])
+
+port = None
+host = None
+
+offset_str = ''
+offset = 0
+
+for o, a in opts:
+ if o == '--offset':
+ offset_str = a
+ offset = int(a)
+ elif o == '--port':
+ port = int(a)
+ elif o == '--host':
+ host = a
doc_dir = 'doc%s' % offset_str
+
+if not port:
+ port = config.server_port + offset
+ print port
+if not host:
+ host = config.server_host
+ print host
try:
f = open('%s/test.odt' % doc_dir)
@@ -56,7 +74,7 @@
print "you need a %s subdir with appropriate documents" % doc_dir
sys.exit(1)
-sp = ServerProxy('http://%s:%d' % (config.server_host, config.server_port+offset))
+sp = ServerProxy('http://%s:%d' % (host, port))
def extractExtensions(item_list):
return [item[0] for item in item_list]
Modified: erp5/trunk/utils/oood/testOoodHighLoad.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/testOoodHighLoad.py?rev=15157&r1=15156&r2=15157&view=diff
==============================================================================
--- erp5/trunk/utils/oood/testOoodHighLoad.py (original)
+++ erp5/trunk/utils/oood/testOoodHighLoad.py Thu Jul 5 15:41:42 2007
@@ -35,6 +35,7 @@
an integer which means an error code - the serwer had a problem and handled it properly.
"""
+import getopt
import os
import random
import sys
@@ -51,22 +52,42 @@
max_interval = 15
###
-if len(sys.argv)>2:
- offset_str = sys.argv[2]
- offset=int(offset_str)
-else:
- offset_str=''
- offset = 0
+opts, args = getopt.getopt(sys.argv[1:], '', ["offset=", "port=", "host=", 'total-conversions='])
+
+port = None
+host = None
+total_conversions = 100
+
+offset_str = ''
+offset = 1
+
+for o, a in opts:
+ if o == '--offset':
+ offset_str = a
+ offset = int(a)
+ elif o == '--port':
+ port = int(a)
+ elif o == '--host':
+ host = a
+ elif o == '--total-conversions':
+ total_conversions = a
doc_dir = 'doc%s' % offset_str
-
-sp = ServerProxy('http://%s:%d' % (config.server_host, config.server_port+offset))
-
-if len(sys.argv) > 1:
- total_conversions = int(sys.argv[1])
-else:
- total_conversions = 100
+if not port:
+ port = config.server_port + offset
+ print port
+if not host:
+ host = config.server_host
+ print host
+
+try:
+ f = open('%s/test.odt' % doc_dir)
+except IOError:
+ print "you need a %s subdir with appropriate documents" % doc_dir
+ sys.exit(1)
+
+sp = ServerProxy('http://%s:%d' % (host, port))
# create a list of od? files if not present
# first check if the oood_home is writeable
Modified: erp5/trunk/utils/oood/testOoodOldFormats.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/testOoodOldFormats.py?rev=15157&r1=15156&r2=15157&view=diff
==============================================================================
--- erp5/trunk/utils/oood/testOoodOldFormats.py (original)
+++ erp5/trunk/utils/oood/testOoodOldFormats.py Thu Jul 5 15:41:42 2007
@@ -33,6 +33,7 @@
"""
import sys, base64, unittest
+import getopt
from xmlrpclib import *
sys.path.append('/etc/oood')
import config
@@ -40,7 +41,40 @@
enc = base64.encodestring
-sp = ServerProxy('http://%s:%d' % (config.server_host, config.server_port))
+opts, args = getopt.getopt(sys.argv[1:], '', ["offset=", "port=", "host="])
+
+port = None
+host = None
+
+offset_str = ''
+offset = 0
+
+for o, a in opts:
+ if o == '--offset':
+ offset_str = a
+ offset = int(a)
+ elif o == '--port':
+ port = int(a)
+ elif o == '--host':
+ host = a
+
+doc_dir = 'doc%s' % offset_str
+
+if not port:
+ port = config.server_port + offset
+ print port
+if not host:
+ host = config.server_host
+ print host
+
+try:
+ f = open('%s/test.odt' % doc_dir)
+except IOError:
+ print "you need a %s subdir with appropriate documents" % doc_dir
+ sys.exit(1)
+
+sp = ServerProxy('http://%s:%d' % (host, port))
+
class TestFileOperations(unittest.TestCase):
More information about the Erp5-report
mailing list