diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-04-18 10:17:30 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-04-18 10:19:11 +0100 |
| commit | ec95e6a17c591bff6c0582c304c1beeb1efe141f (patch) | |
| tree | 5a9d27125ab5e70a6507c43a9395f03cf026f3ad /pyuno | |
| parent | fdo#74150:Numbered list getting display after RT -table-within-table-1.docx (diff) | |
| download | core-ec95e6a17c591bff6c0582c304c1beeb1efe141f.tar.gz core-ec95e6a17c591bff6c0582c304c1beeb1efe141f.zip | |
add an import ssl test
Change-Id: Ia2dad214e6a224c979a8664bfded7d2caffb221a
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/Module_pyuno.mk | 6 | ||||
| -rw-r--r-- | pyuno/PythonTest_pytests.mk | 1 | ||||
| -rw-r--r-- | pyuno/PythonTest_pyuno_pytests_ssl.mk | 16 | ||||
| -rw-r--r-- | pyuno/qa/pytests/ssl.py | 12 |
4 files changed, 35 insertions, 0 deletions
diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk index 9a079938f162..9b966e58df61 100644 --- a/pyuno/Module_pyuno.mk +++ b/pyuno/Module_pyuno.mk @@ -60,6 +60,12 @@ endif endif # SYSTEM_PYTHON +ifneq ($(DISABLE_PYTHON),TRUE) +$(eval $(call gb_Module_add_targets,pyuno, \ + PythonTest_pyuno_pytests_ssl \ +)) +endif + ifneq (,$(filter PythonTest_pytests,$(MAKECMDGOALS))) $(eval $(call gb_Module_add_targets,pyuno, \ PythonTest_pytests \ diff --git a/pyuno/PythonTest_pytests.mk b/pyuno/PythonTest_pytests.mk index 63ffbb67731c..177195fb6d85 100644 --- a/pyuno/PythonTest_pytests.mk +++ b/pyuno/PythonTest_pytests.mk @@ -25,5 +25,6 @@ $(eval $(call gb_PythonTest_PythonTest,pytests)) $(call gb_PythonTest_get_target,pytests) : \ $(call gb_PythonTest_get_target,pyuno_pytests_insertremovecells) \ + $(call gb_PythonTest_get_target,pyuno_pytests_ssl) \ # vim: set noet sw=4 ts=4: diff --git a/pyuno/PythonTest_pyuno_pytests_ssl.mk b/pyuno/PythonTest_pyuno_pytests_ssl.mk new file mode 100644 index 000000000000..95779dd94915 --- /dev/null +++ b/pyuno/PythonTest_pyuno_pytests_ssl.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_PythonTest_PythonTest,pyuno_pytests_ssl)) + +$(eval $(call gb_PythonTest_add_modules,pyuno_pytests_ssl,$(SRCDIR)/pyuno/qa/pytests,\ + ssl \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/pyuno/qa/pytests/ssl.py b/pyuno/qa/pytests/ssl.py new file mode 100644 index 000000000000..a67f5323b700 --- /dev/null +++ b/pyuno/qa/pytests/ssl.py @@ -0,0 +1,12 @@ +import unittest + +from org.libreoffice.unotest import pyuno + +#I want to ensure that import ssl works on all platforms +class SSLTest(unittest.TestCase): + def test_ssl_import(self): + import ssl + +if __name__ == '__main__': + unittest.main() + |