Commit 915df2a8 authored by Julien Muchembled's avatar Julien Muchembled

Import ERP5TypeTestCase before execution of layer.ZopeLite.setUp

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35418 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d030531e
master allow_login_change allow_login_change_wip arnau arnau-RD-Components-CacheTool arnau-RD-Components-Products-import-compat arnau-RD-Components-astroid_cache_per_component_reset arnau-RD-Components-erp5_crm arnau-RD-Components-erp5_trade-TODO-Interactor arnau-TM-Components-Migrate-PortalTransforms arnau-TM-Components-ModuleSecurityInfo arnau-TM-Components-PortalTransforms arnau-TM-FEC-output arnau-TM-isBuildable-with-multiple-BusinessLinks arnau-TM-jabber-client-desktop-notifications arnau-TM-newContent-temp_object arnau-TM-runUnitTest-clear-previous-execution-catalog arnau-TM-wkhtmltopdf arnau-WIP arnau-kns arnau-kns-without-property-mapping arnau-merge arnau-poc arnau-real-time-inventory-accounting auto_extend_select_list autoflake backup_erp5_workflow bk_erp5ish_actions_tool bk_sqlcatalog boc-interaction-drop bt5_config cache callable-jupyter-storage catalog_filter catalog_fulltext catalog_fulltext_old cedric cedriclen cedriclen-eos certificate_authority cherry-pick-4a8e045d cleanJSByJSLint clean_up_upgrader cleanup_acquisition_base_category cmf_upgrade_versions credential_update_action datetimefield deferred_listbox delivery_item_barcode douglas_forum dream_distributor dsn-phase3 enhance_scalability_testing eos-dev erp5-component erp5-forum erp5-imt erp5-messenger erp5-preference erp5-release erp5-slapos-upgrade erp5-util-testing erp5-vifib erp5-vifib-cleanup erp5_calendar erp5_catalog erp5_catalog_final erp5_corporate_identity erp5_free_subscription erp5_hal_json_style_fix_restricted_access_with_traverse erp5_payslip_migration erp5_workflow erp5testnode_max_timeout feat/ERP5JS_google_login feat/accept-multiple-portal-types-as-external-login feat/coding_style_form_naming feat/configurator_bt_categories feat/dms_implicit_predecessor_successor_fields feat/erp5_ide feat/inventory_api_group_by_time_interval_list feat/no_update_button feat/olapy feat/python_language_support feat/stock_browser_navigation feat/validated_currency feature/renderjs-ui-no-header fix/advance_ecommerce_coding_crimes fix/base_call_dialog_method_log fix/configurator_workflow_cleanups fix/login_validate_check_consistency fix/support-request-app-empty fix/test_result_after_mep fix/workflow_method_security for_testrunner_1 for_testrunner_2 for_testrunner_3 for_testrunner_4 gabriel gadget-json-value hotfix/rjs-formfields-padding improve_default_caching_policy_manager initsite interaction-drop isDeletable ivan jerome-bt-reference-doc jerome_graph_editor_renderjs jerome_user_preference_time_zone jio jm/form-action-guard js-ui kns lazy_simulation_causality lignan lingnan listbox_url macros_fix mame-test-stock-indexation master-erp5-test-result-scalability master-erp5-test-result-scalability-rebase master-test-fix-additionalbt5path mic_wind monitoring-graph mrp new-render-presentation no_longer_simulated_state officejs officejs_slideshow_editor pere portal_callables portal_solver_process_security_configuration presentation publish_recursiveReindexObject rebased_mrp refactor/base_edit reindex_calendar_after_change_calendar_exception reveal_editor reveal_editor_bak revert-38554dbe scalability-master scalability-master2 scalability-master2-rebase scalability-roque scalability-roque-2 scalability-run-command shop-box shop-box-rebase streaming_fix streaming_fix-0 syncml taskdistribution-xmlrpc-binary test_page testnode_software_link timezones tristan tristan-merge tristan-performance trustable-x-forwarded-for ttrm valentin_translation_fix view-aggregated-amounts vivekpab_renderjs_interfaces wenjie wenjie_branch wsgi wsgi-gevent wsgi_backport_setbody_lock wsgi_medusa_stream_fix yryr yryr-components-cp yryr-inventory-cache yryr-test yryr-with-components yusei 0.4.59.1 0.4.59 test-ui test-rjsacc test-rjs renderjs-test erp5.util-0.4.68 erp5.util-0.4.67 erp5.util-0.4.66 erp5.util-0.4.65 erp5.util-0.4.64 erp5.util-0.4.63 erp5.util-0.4.62 erp5.util-0.4.61 erp5.util-0.4.60 erp5.util-0.4.59.1 erp5.util-0.4.59 erp5.util-0.4.58 erp5.util-0.4.57 erp5.util-0.4.56 erp5.util-0.4.55 erp5.util-0.4.54 erp5.util-0.4.53 erp5.util-0.4.52 erp5.util-0.4.49 erp5.util-0.4.46 erp5.util-0.4.44 erp5.util-0.4.43 erp5.util-0.4.41 erp5.util-0.4.40 erp5.util-0.4.37 erp5.util-0.4.1 erp5.util-0.4 erp5.util-0.3 erp5.util-0.2 erp5.util-0.1
No related merge requests found
...@@ -376,7 +376,7 @@ def runUnitTestList(test_list, verbosity=1, debug=0): ...@@ -376,7 +376,7 @@ def runUnitTestList(test_list, verbosity=1, debug=0):
# patched by the layer.setUp() call. # patched by the layer.setUp() call.
import OFS.Application import OFS.Application
import_products = OFS.Application.import_products import_products = OFS.Application.import_products
from Testing import ZopeTestCase # This will import custom_zodb.py from Testing import ZopeTestCase # Zope 2.8: this will import custom_zodb.py
OFS.Application.import_products = import_products OFS.Application.import_products = import_products
try: try:
...@@ -436,6 +436,12 @@ def runUnitTestList(test_list, verbosity=1, debug=0): ...@@ -436,6 +436,12 @@ def runUnitTestList(test_list, verbosity=1, debug=0):
# change current directory to the test home, to create zLOG.log in this dir. # change current directory to the test home, to create zLOG.log in this dir.
os.chdir(tests_home) os.chdir(tests_home)
# import ERP5TypeTestCase before calling layer.ZopeLite.setUp
# XXX What if the unit test itself uses 'onsetup' ? We should be able to call
# remaining 'onsetup' hooks just before executing the test suite.
from Products.ERP5Type.tests.ERP5TypeTestCase import \
ProcessingNodeTestCase, ZEOServerTestCase, dummy_setUp, dummy_tearDown
try: try:
from Testing.ZopeTestCase import layer from Testing.ZopeTestCase import layer
except ImportError: except ImportError:
...@@ -447,7 +453,10 @@ def runUnitTestList(test_list, verbosity=1, debug=0): ...@@ -447,7 +453,10 @@ def runUnitTestList(test_list, verbosity=1, debug=0):
# FIXME: We should start using Zope layers. Our setup will probably # FIXME: We should start using Zope layers. Our setup will probably
# be faster and we could drop most of this code we currently maintain # be faster and we could drop most of this code we currently maintain
# ourselves # ourselves
layer.ZopeLite.setUp() layer.ZopeLite.setUp() # Zope 2.12: this will import custom_zodb.py
def assertFalse():
assert False
layer.onsetup = assertFalse
TestRunner = backportUnittest.TextTestRunner TestRunner = backportUnittest.TextTestRunner
...@@ -455,8 +464,6 @@ def runUnitTestList(test_list, verbosity=1, debug=0): ...@@ -455,8 +464,6 @@ def runUnitTestList(test_list, verbosity=1, debug=0):
from ZEO.ClientStorage import ClientStorage from ZEO.ClientStorage import ClientStorage
from Zope2.custom_zodb import \ from Zope2.custom_zodb import \
save_mysql, zeo_server_pid, zeo_client_pid_list, Storage save_mysql, zeo_server_pid, zeo_client_pid_list, Storage
from Products.ERP5Type.tests.ERP5TypeTestCase import \
ProcessingNodeTestCase, ZEOServerTestCase, dummy_setUp, dummy_tearDown
def shutdown(signum, frame, signum_set=set()): def shutdown(signum, frame, signum_set=set()):
Lifetime.shutdown(0) Lifetime.shutdown(0)
signum_set.add(signum) signum_set.add(signum)
......
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