-
state
@@ -682,8 +682,8 @@
- 1537967626.41
- UTC
+ 1561472219.01
+ GMT+3
diff --git a/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyOfficeSpreadsheetConvert.zpt b/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyOfficeSpreadsheetConvert.zpt
index 0e07611bb72174bf45a069bc64edda981606ce9a..3fe157292767680e08ab625653f2367362afc29a 100644
--- a/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyOfficeSpreadsheetConvert.zpt
+++ b/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyOfficeSpreadsheetConvert.zpt
@@ -79,16 +79,7 @@
//div[@data-gadget-scope="notification"]//button[text()='Data Updated'] |
|
-
- click |
- //a[@data-i18n="Synchronize"] |
- |
-
-
- waitForElementPresent |
- //a[text()='Add'] |
- |
-
+
open |
${base_url}/portal_skins/erp5_officejs_ui_test/gadget_ooffice_spreadsheet_convert_check.html |
diff --git a/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyfficeSpreadsheetBadDocumentState.zpt b/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyfficeSpreadsheetBadDocumentState.zpt
index 2fb95f69e0f17673a247a8aaf7a3dff92e7e989b..38911489bf73eff0c080674952ce9f720a1f809b 100644
--- a/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyfficeSpreadsheetBadDocumentState.zpt
+++ b/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyfficeSpreadsheetBadDocumentState.zpt
@@ -39,8 +39,7 @@
-
-
+
diff --git a/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyfficeSpreadsheetErp5Synchronization.zpt b/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyfficeSpreadsheetErp5Synchronization.zpt
index f4fd3c821557fe534a59cc2f9f2d61d0fc51ec70..06fef1cbbd403df263abbe69218fdc9d063a1bd8 100644
--- a/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyfficeSpreadsheetErp5Synchronization.zpt
+++ b/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyfficeSpreadsheetErp5Synchronization.zpt
@@ -72,7 +72,12 @@
id |
- open |
+ pause |
+ 1000 |
+ |
+
+
+ openAndWait |
${base_url}/document_module/Zuite_waitForActivities |
|
@@ -110,8 +115,7 @@
-
-
+
+
+ pause |
+ 1000 |
+ |
+
openAndWait |
${base_url}/Zuite_waitForActivities |
diff --git a/product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py b/product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py
index a6af4e8095944510da51ebe46870167364054fb1..9f20e39b2565b38b873693baf4411140680b83e5 100644
--- a/product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py
+++ b/product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py
@@ -208,6 +208,7 @@ class FunctionalTestRunner:
browser = webdriver.Firefox(**kw)
start_time = time.time()
browser.get(self._getTestURL())
+ browser.maximize_window()
WebDriverWait(browser, 10).until(EC.presence_of_element_located((
By.XPATH, '//iframe[@id="testSuiteFrame"]'
@@ -230,6 +231,8 @@ class FunctionalTestRunner:
html_parser
)
browser.quit()
+ # XXX ffmpeg lose last video part if xvfb quit before ffmpeg
+ time.sleep(5)
finally:
xvfb.quit()
return iframe
diff --git a/tests/__init__.py b/tests/__init__.py
index 580935d622e98b70ce2b2f976a2339adbca29f28..94f6be0ddec1d406cdffe559ecacf192ed31e6ad 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -34,10 +34,7 @@ class _ERP5(ERP5TypeTestSuite):
path = "%s/../" % HERE
component_re = re.compile(".*/([^/]+)/TestTemplateItem/portal_components"
"/test\.[^.]+\.([^.]+).py$")
- for test_path in (
- glob('%s/product/*/tests/test*.py' % path) +
- glob('%s/bt5/*/TestTemplateItem/test*.py' % path) +
- glob('%s/bt5/*/TestTemplateItem/portal_components/test.*.test*.py' % path)):
+ for test_path in glob('%s/bt5/erp5_officejs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path):
component_re_match = component_re.match(test_path)
if component_re_match is not None:
test_case = "%s:%s" % (component_re_match.group(1),