[libreoffice] 03/12: split uno/pyuno tests and fix names; add python3 Depends: for safety

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit 5eb22b8ee84f9aeb94da6ca9ed45df3faed327ed
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Jul 3 18:50:53 2017 +0200

    split uno/pyuno tests and fix names; add python3 Depends: for safety
---
 changelog                          | 2 ++
 tests/control                      | 5 ++++-
 tests/pyuno-import                 | 6 +++++-
 tests/{pyuno-import => uno-import} | 0
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 02910fb..1a30421 100644
--- a/changelog
+++ b/changelog
@@ -14,6 +14,8 @@ libreoffice (1:5.3.4-2) UNRELEASED; urgency=medium
     Build-Depends-(Indep): to debian/tests/control.in; misses some packages
     (e.g. ant) and it should work at least since autopktest 3.16 from Jul 2015;
     use @builddeps@ instead
+  * debian/tests/control, debian/tests/*uno-import.diff: split; make pyuno-import
+    test import pyuno while uno-import does import uno (the uichecks do the former).
 
  -- Rene Engelhard <rene at debian.org>  Sun, 02 Jul 2017 16:39:51 +0000
 
diff --git a/tests/control b/tests/control
index db4ca52..099f8b7 100644
--- a/tests/control
+++ b/tests/control
@@ -1,8 +1,11 @@
 Tests: junit-subsequentcheck
 Depends: @builddeps@, libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb
 
+Tests: uno-import
+Depends: python3, python3-uno
+
 Tests: pyuno-import
-Depends: python3-uno
+Depends: python3, python3-uno
 
 Tests: sdk-examples
 Depends: libreoffice-dev, libreoffice-dev-doc, libreoffice-dev-common, libreoffice-java-common, build-essential, default-jdk
diff --git a/tests/pyuno-import b/tests/pyuno-import
index 1b7778c..ff7503a 100755
--- a/tests/pyuno-import
+++ b/tests/pyuno-import
@@ -1,3 +1,7 @@
 #!/usr/bin/python3
 
-import uno
+import sys, os
+sys.path.append('/usr/lib/libreoffice/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc')
+
+import pyuno
diff --git a/tests/pyuno-import b/tests/uno-import
old mode 100755
new mode 100644
similarity index 100%
copy from tests/pyuno-import
copy to tests/uno-import

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git