From bdd43f31a45fde893d4d2537eb92f64e245d0d4d Mon Sep 17 00:00:00 2001 From: Rafael Monnerat <rafael@nexedi.com> Date: Tue, 16 Aug 2011 13:28:56 -0300 Subject: [PATCH] Configurator UI Test: Remove useless code and do not re-setup conversion server --- .../Zuite_getConfigurationTestDict.xml | 3 - .../Zuite_getConversionServerDict.xml | 71 ------------------- .../Zuite_setUpConfigurationTest.xml | 7 +- .../bt/change_log | 3 + .../bt/revision | 2 +- 5 files changed, 9 insertions(+), 77 deletions(-) delete mode 100644 bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_getConversionServerDict.xml diff --git a/bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_getConfigurationTestDict.xml b/bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_getConfigurationTestDict.xml index 528928acea..6bae8a6bf3 100644 --- a/bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_getConfigurationTestDict.xml +++ b/bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_getConfigurationTestDict.xml @@ -89,9 +89,6 @@ configuration_dict = {\n "business_configuration_id": "STANDARD_CONFIGURATOR_TEST",\n \'bt_repository_list\':[\'http://www.erp5.org/dists/snapshot/bt5/\'],\n \n - # More configurations\n - "oood_hostname": "localhost",\n - "oood_port": 8008,\n }\n \n return configuration_dict\n diff --git a/bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_getConversionServerDict.xml b/bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_getConversionServerDict.xml deleted file mode 100644 index dda02c6d4c..0000000000 --- a/bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_getConversionServerDict.xml +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>Script_magic</string> </key> - <value> <int>3</int> </value> - </item> - <item> - <key> <string>_bind_names</string> </key> - <value> - <object> - <klass> - <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>_asgns</string> </key> - <value> - <dictionary> - <item> - <key> <string>name_container</string> </key> - <value> <string>container</string> </value> - </item> - <item> - <key> <string>name_context</string> </key> - <value> <string>context</string> </value> - </item> - <item> - <key> <string>name_m_self</string> </key> - <value> <string>script</string> </value> - </item> - <item> - <key> <string>name_subpath</string> </key> - <value> <string>traverse_subpath</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>_body</string> </key> - <value> <string>"""\n - Return the configuration for use into\n - preferences.\n -"""\n -return context.ExpressZuite_getExpressConfigurationInfo()\n -</string> </value> - </item> - <item> - <key> <string>_params</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>Zuite_getConversionServerDict</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_setUpConfigurationTest.xml b/bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_setUpConfigurationTest.xml index 184061a7b0..f6f571f637 100644 --- a/bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_setUpConfigurationTest.xml +++ b/bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_setUpConfigurationTest.xml @@ -69,8 +69,11 @@ default_site_preference.setPreferredHtmlStyleUnsavedFormWarning(False)\n default_site_preference.setPreferredHtmlStyleDevelopperMode(None)\n default_site_preference.setPreferredHtmlStyleAccessTab(\'1\')\n \n -default_site_preference.setPreferredOoodocServerAddress(configuration_info.get("oood_hostname",\'localhost\'))\n -default_site_preference.setPreferredOoodocServerPortNumber(configuration_info.get("oood_port",8008))\n +previous_conversion_server_address = portal.portal_preferences.getPreferredOoodocServerAddress()\n +default_site_preference.setPreferredOoodocServerAddress(previous_conversion_server_address)\n +\n +previous_conversion_port = portal.portal_preferences.getPreferredOoodocServerPortNumber()\n +default_site_preference.setPreferredOoodocServerPortNumber(previous_conversion_port)\n \n if default_site_preference.getPreferenceState() != \'global\':\n default_site_preference.enable()\n diff --git a/bt5/erp5_configurator_standard_ui_test/bt/change_log b/bt5/erp5_configurator_standard_ui_test/bt/change_log index aec97e52bd..9a9dbe4d15 100644 --- a/bt5/erp5_configurator_standard_ui_test/bt/change_log +++ b/bt5/erp5_configurator_standard_ui_test/bt/change_log @@ -1,3 +1,6 @@ +2011-08-16 rafael +* Remove useless code and do not re-setup conversion server. + 2011-04-13 lucas * The 'Hello' text is not displayed anymore. diff --git a/bt5/erp5_configurator_standard_ui_test/bt/revision b/bt5/erp5_configurator_standard_ui_test/bt/revision index 0552576c87..c029c62fca 100644 --- a/bt5/erp5_configurator_standard_ui_test/bt/revision +++ b/bt5/erp5_configurator_standard_ui_test/bt/revision @@ -1 +1 @@ -669 \ No newline at end of file +672 \ No newline at end of file -- 2.30.9