summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-04-10 16:41:31 +0200
committerStephan Bergmann <sbergman@redhat.com>2019-04-10 18:16:41 +0200
commita183955acacbc1a3e8579f360f12fd37536120fc (patch)
tree20c89df305beff7e3a497914605c81e397286cbf /uitest
parenttdf#124652 Guard Gtk3KDE5FolderPicker::execute with SolarMutexGuard (diff)
downloadcore-a183955acacbc1a3e8579f360f12fd37536120fc.tar.gz
core-a183955acacbc1a3e8579f360f12fd37536120fc.zip
Fix one more get_url_for_data_file
Change-Id: I22d556fe4719fc8e7b53c66b778f6b4196f8f024 Reviewed-on: https://gerrit.libreoffice.org/70523 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'uitest')
-rw-r--r--uitest/UITest_demo_ui.mk4
-rw-r--r--uitest/demo_ui/handle_multiple_files.py5
2 files changed, 7 insertions, 2 deletions
diff --git a/uitest/UITest_demo_ui.mk b/uitest/UITest_demo_ui.mk
index 11432f9175a1..bb67e21b8bca 100644
--- a/uitest/UITest_demo_ui.mk
+++ b/uitest/UITest_demo_ui.mk
@@ -13,4 +13,8 @@ $(eval $(call gb_UITest_add_modules,demo_ui,$(SRCDIR)/uitest,\
demo_ui/ \
))
+$(eval $(call gb_UITest_set_defs,demo_ui, \
+ TDOC="$(SRCDIR)/uitest/demo_ui/data" \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/uitest/demo_ui/handle_multiple_files.py b/uitest/demo_ui/handle_multiple_files.py
index a69cf0723fe2..e60d3884b63e 100644
--- a/uitest/demo_ui/handle_multiple_files.py
+++ b/uitest/demo_ui/handle_multiple_files.py
@@ -11,13 +11,14 @@ from libreoffice.uno.eventlistener import EventListener
from uitest.framework import UITestCase
from uitest.debug import sleep
-from uitest.path import get_srcdir_url
import time
+import org.libreoffice.unotest
import os
+import pathlib
def get_url_for_data_file(file_name):
- return get_srcdir_url() + "/uitest/demo_ui/data/" + file_name
+ return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
class HandleFiles(UITestCase):