Commit a7d78aca authored by Jérome Perrin's avatar Jérome Perrin Committed by Kazuhiko Shiozaki

ERP5TypeTestCase: only update translation table after actually installing bt

When we --load, the sql dump is supposed to be up to date, we don't
need to update translation table every time. This is mainly to solve an
issue that it might not be possible to run ERP5Site_updateTranslationTable
at this point, with testUpgradeInstanceWithOldDataFs this script uses
a print statement, which causes a SyntaxError.
parent 2e926feb
...@@ -1155,6 +1155,7 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin): ...@@ -1155,6 +1155,7 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin):
return False return False
update_translation_table = False
for url, bt_title in business_template_list: for url, bt_title in business_template_list:
if (update_business_templates and if (update_business_templates and
erp5_load_data_fs and erp5_load_data_fs and
...@@ -1193,6 +1194,7 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin): ...@@ -1193,6 +1194,7 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin):
bt.install(light_install=light_install, bt.install(light_install=light_install,
object_to_update=install_kw, object_to_update=install_kw,
check_dependencies=False) check_dependencies=False)
update_translation_table = True
if bt.isCatalogUpdatable() and ( if bt.isCatalogUpdatable() and (
int(os.environ.get('erp5_tests_recreate_catalog', 0)) or \ int(os.environ.get('erp5_tests_recreate_catalog', 0)) or \
int(os.environ.get('erp5_load_data_fs', 0)) == 0): int(os.environ.get('erp5_load_data_fs', 0)) == 0):
...@@ -1201,6 +1203,8 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin): ...@@ -1201,6 +1203,8 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin):
self.commit() self.commit()
if not quiet: if not quiet:
ZopeTestCase._print('done (%.3fs)\n' % (time.time() - start)) ZopeTestCase._print('done (%.3fs)\n' % (time.time() - start))
if update_translation_table:
self._updateTranslationTable()
def _getSiteCreationParameterDict(self): def _getSiteCreationParameterDict(self):
kw = _getConnectionStringDict() kw = _getConnectionStringDict()
...@@ -1295,7 +1299,6 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin): ...@@ -1295,7 +1299,6 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin):
light_install=light_install, light_install=light_install,
quiet=quiet) quiet=quiet)
self._recreateCatalog() self._recreateCatalog()
self._updateTranslationTable()
self._updateConversionServerConfiguration() self._updateConversionServerConfiguration()
self._updateMemcachedConfiguration() self._updateMemcachedConfiguration()
# Create a Manager user at the Portal level # Create a Manager user at the Portal level
......
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