[Libreoffice-commits] core.git: sw/qa

[Stephan Bergmann (via logerrit)]

 sw/qa/uitest/writer_tests/tdf81457.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit cdedcfe5548f676c6a39a3c9cc39eea0bcd99e80
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Oct 21 13:18:31 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Oct 21 20:35:47 2020 +0200

    Fix one more get_url_for_data_file
    
    ...similar to 8bf87fe5112fbec54db1496b5037c43e24bc76fe "Fix one more
    get_url_for_data_file" etc.
    
    <https://ci.libreoffice.org//job/lo_tb_master_linux_dbg/30817/> had failed
    PythonTest_solenv_python with
    
    > Traceback (most recent call last):
    >   File "/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/solenv/qa/python/gbuildtojson.py", line 136, in test_gbuildtojson
    >     shutil.copytree(os.path.join(os.environ['SRCDIR'], module), os.path.join(self.tempsrc, module),
    >   File "/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/instdir/program/python-core-3.8.4/lib/shutil.py", line 554, in copytree
    >     return _copytree(entries=entries, src=src, dst=dst, symlinks=symlinks,
    >   File "/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/instdir/program/python-core-3.8.4/lib/shutil.py", line 510, in _copytree
    >     raise Error(errors)
    > shutil.Error: [('/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/sw/qa/uitest/writer_tests/data/.~lock.tdf81457.odt#', '/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/tempdir/gbuildadynlc3l/sw/qa/uitest/writer_tests/data/.~lock.tdf81457.odt#', "[Errno 2] No such file or directory: '/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/sw/qa/uitest/writer_tests/data/.~lock.tdf81457.odt#'")]
    
    presumably because UITest_writer_tests was running in parallel and temporarily
    created that sw/qa/uitest/writer_tests/data/.~lock.tdf81457.odt# lock file in
    the source tree.
    
    Change-Id: Icb735565bbd8b1cdb076d3844efb4a42bc333aa1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104618
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/qa/uitest/writer_tests/tdf81457.py b/sw/qa/uitest/writer_tests/tdf81457.py
index 3b7108866ee3..436ed9cd7405 100644
--- a/sw/qa/uitest/writer_tests/tdf81457.py
+++ b/sw/qa/uitest/writer_tests/tdf81457.py
@@ -9,14 +9,15 @@
 
 from uitest.framework import UITestCase
 from libreoffice.uno.propertyvalue import mkPropertyValues
-from uitest.path import get_srcdir_url
 from uitest.uihelper.common import get_state_as_dict
+import org.libreoffice.unotest
+import pathlib
 import time
 from uitest.debug import sleep
 from uitest.uihelper.common import select_pos
 
 def get_url_for_data_file(file_name):
-   return get_srcdir_url() + "/sw/qa/uitest/writer_tests/data/" + file_name
+   return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
 
 class tdf81457(UITestCase):