diff options
| -rw-r--r-- | dbaccess/qa/extras/testdocuments/fdo84315.odb.lck | bin | 0 -> 16 bytes | |||
| -rw-r--r-- | dbaccess/qa/python/fdo84315.py | 2 | ||||
| -rw-r--r-- | unotest/source/python/org/libreoffice/unotest.py | 5 |
3 files changed, 5 insertions, 2 deletions
diff --git a/dbaccess/qa/extras/testdocuments/fdo84315.odb.lck b/dbaccess/qa/extras/testdocuments/fdo84315.odb.lck Binary files differnew file mode 100644 index 000000000000..16c4bccef560 --- /dev/null +++ b/dbaccess/qa/extras/testdocuments/fdo84315.odb.lck diff --git a/dbaccess/qa/python/fdo84315.py b/dbaccess/qa/python/fdo84315.py index e3e2fa3a2794..a4bbc1b926b1 100644 --- a/dbaccess/qa/python/fdo84315.py +++ b/dbaccess/qa/python/fdo84315.py @@ -22,7 +22,7 @@ class Fdo84315(unittest.TestCase): cls._uno = UnoInProcess() cls._uno.setUp() workdir = os.environ[ "WORKDIR_FOR_BUILD" ] - cls._xDoc = cls._uno.openDoc(os.path.join(workdir, "CppunitTest/fdo84315.odb")) + cls._xDoc = cls._uno.openDoc(workdir + "/CppunitTest/fdo84315.odb") @classmethod def tearDownClass(cls): diff --git a/unotest/source/python/org/libreoffice/unotest.py b/unotest/source/python/org/libreoffice/unotest.py index 0acf05afe617..28f5eca0c16f 100644 --- a/unotest/source/python/org/libreoffice/unotest.py +++ b/unotest/source/python/org/libreoffice/unotest.py @@ -224,7 +224,10 @@ class UnoInProcess: desktop = smgr.createInstanceWithContext("com.sun.star.frame.Desktop", self.getContext()) props = [("Hidden", True), ("ReadOnly", False), ("AsTemplate", False)] loadProps = tuple([mkPropertyValue(name, value) for (name, value) in props]) - url = "file://" + file + if os.name == "nt": + url = "file:///" + file + else: + url = "file://" + file self.xDoc = desktop.loadComponentFromURL(url, "_blank", 0, loadProps) assert(self.xDoc) return self.xDoc |