Commit a12d43f0 authored by Jérome Perrin's avatar Jérome Perrin

tests: don't include trailing space in test output

parent 86eeb759
...@@ -743,7 +743,7 @@ class ERP5TypeTestCaseMixin(ProcessingNodeTestCase, PortalTestCase, functional.F ...@@ -743,7 +743,7 @@ class ERP5TypeTestCaseMixin(ProcessingNodeTestCase, PortalTestCase, functional.F
""" """
Shortcut function to log a message Shortcut function to log a message
""" """
ZopeTestCase._print('\n%s ' % message) ZopeTestCase._print('\n%s' % message)
LOG('Testing ... ', DEBUG, message) LOG('Testing ... ', DEBUG, message)
def publish(self, path, basic=None, env=None, extra=None, def publish(self, path, basic=None, env=None, extra=None,
...@@ -1320,7 +1320,7 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin): ...@@ -1320,7 +1320,7 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin):
# Log out # Log out
if not quiet: if not quiet:
ZopeTestCase._print('Logout ... \n') ZopeTestCase._print('Logout ...\n')
noSecurityManager() noSecurityManager()
if not quiet: if not quiet:
ZopeTestCase._print('done (%.3fs)\n' % (time.time()-_start,)) ZopeTestCase._print('done (%.3fs)\n' % (time.time()-_start,))
......
...@@ -50,14 +50,14 @@ if load: ...@@ -50,14 +50,14 @@ if load:
if save_mysql: if save_mysql:
if os.path.exists(dump_sql_path): if os.path.exists(dump_sql_path):
command = "mysql %s < %s" % (getMySQLArguments(), dump_sql_path) command = "mysql %s < %s" % (getMySQLArguments(), dump_sql_path)
_print("Restoring MySQL database with %s ... " % command) _print("Restoring MySQL database with %s ..." % command)
_start = time.time() _start = time.time()
subprocess.check_call(command, shell=True) subprocess.check_call(command, shell=True)
_print('done (%.3fs)\n' % (time.time() - _start)) _print('done (%.3fs)\n' % (time.time() - _start))
else: else:
_print("Could not find MySQL dump (%r), will recreate catalog ... " % dump_sql_path) _print("Could not find MySQL dump (%r), will recreate catalog ..." % dump_sql_path)
os.environ['erp5_tests_recreate_catalog'] = '1' os.environ['erp5_tests_recreate_catalog'] = '1'
_print("Restoring static files ... ") _print("Restoring static files ...")
else: else:
if save and not (neo_storage or zeo_client) and os.path.exists(data_fs_path): if save and not (neo_storage or zeo_client) and os.path.exists(data_fs_path):
_print("About to remove existing Data.fs %s (press Ctrl+C to abort)" % data_fs_path) _print("About to remove existing Data.fs %s (press Ctrl+C to abort)" % data_fs_path)
...@@ -193,4 +193,4 @@ if with_wendelin_core and not in_forked_process: ...@@ -193,4 +193,4 @@ if with_wendelin_core and not in_forked_process:
wcfs_server = wcfs.start(zurl) wcfs_server = wcfs.start(zurl)
if node_pid_list is not None: if node_pid_list is not None:
_print("Instance at %r loaded ... " % instance_home) _print("Instance at %r loaded ..." % instance_home)
...@@ -519,7 +519,7 @@ def runUnitTestList(test_list, verbosity=1, debug=0, run_only=None): ...@@ -519,7 +519,7 @@ def runUnitTestList(test_list, verbosity=1, debug=0, run_only=None):
# testReceiptRecognition for example. # testReceiptRecognition for example.
os.environ.setdefault('OMP_NUM_THREADS', '3') os.environ.setdefault('OMP_NUM_THREADS', '3')
_print("Loading Zope ... \n") _print("Loading Zope ...\n")
_start = time.time() _start = time.time()
import Testing import Testing
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment