diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index 30f1aec6..32dc4323 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -26,6 +26,7 @@ test_srcdir = $(top_srcdir)/tests/gpg
TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) \
LC_ALL=C GPG_AGENT_INFO= \
top_srcdir=$(top_srcdir) \
+ LD_LIBRARY_PATH="../../../src/.libs" \
PYTHONPATH=`echo $(abs_builddir)/../build/lib.*`
py_tests = t-wrapper.py \
@@ -33,8 +34,11 @@ py_tests = t-wrapper.py \
t-data.py \
t-encrypt.py \
t-encrypt-sym.py \
+ t-encrypt-sign.py \
t-sign.py \
- t-decrypt.py
+ t-signers.py \
+ t-decrypt.py \
+ t-export.py
TESTS = $(top_srcdir)/tests/gpg/initial.test \
$(py_tests) \
diff --git a/lang/python/tests/t-callbacks.py b/lang/python/tests/t-callbacks.py
index bd88d861..13ce4864 100755
--- a/lang/python/tests/t-callbacks.py
+++ b/lang/python/tests/t-callbacks.py
@@ -17,7 +17,6 @@
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, see .
-import os
from pyme import core, constants
import support
diff --git a/lang/python/tests/t-encrypt-sign.py b/lang/python/tests/t-encrypt-sign.py
new file mode 100755
index 00000000..cba697c1
--- /dev/null
+++ b/lang/python/tests/t-encrypt-sign.py
@@ -0,0 +1,71 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2016 g10 Code GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# GPGME is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, see .
+
+import sys
+from pyme import core, constants
+import support
+
+support.init_gpgme(constants.PROTOCOL_OpenPGP)
+c = core.Context()
+c.set_armor(True)
+
+def check_result(r, typ):
+ if r.invalid_signers:
+ sys.exit("Invalid signer found: {}".format(r.invalid_signers.fpr))
+
+ if len(r.signatures) != 1:
+ sys.exit("Unexpected number of signatures created")
+
+ signature = r.signatures[0]
+ if signature.type != typ:
+ sys.exit("Wrong type of signature created")
+
+ if signature.pubkey_algo != constants.PK_DSA:
+ sys.exit("Wrong pubkey algorithm reported: {}".format(
+ signature.pubkey_algo))
+
+ if signature.hash_algo not in (constants.MD_SHA1, constants.MD_RMD160):
+ sys.exit("Wrong hash algorithm reported: {}".format(
+ signature.hash_algo))
+
+ if signature.sig_class != 0:
+ sys.exit("Wrong signature class reported: {}".format(
+ signature.sig_class))
+
+ if signature.fpr != "A0FF4590BB6122EDEF6E3C542D727CC768697734":
+ sys.exit("Wrong fingerprint reported: {}".format(signature.fpr))
+
+keys = []
+keys.append(c.get_key("A0FF4590BB6122EDEF6E3C542D727CC768697734", False))
+keys.append(c.get_key("D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2", False))
+
+for recipients in (keys, []):
+ source = core.Data("Hallo Leute\n")
+ sink = core.Data()
+
+ c.op_encrypt_sign(recipients, constants.ENCRYPT_ALWAYS_TRUST, source, sink)
+ result = c.op_encrypt_result()
+ assert not result.invalid_recipients, \
+ "Invalid recipient encountered: {}".format(
+ result.invalid_recipients.fpr)
+
+ result = c.op_sign_result()
+ check_result(result, constants.SIG_MODE_NORMAL)
+
+ support.print_data(sink)
diff --git a/lang/python/tests/t-export.py b/lang/python/tests/t-export.py
new file mode 100755
index 00000000..a102425c
--- /dev/null
+++ b/lang/python/tests/t-export.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2016 g10 Code GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# GPGME is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, see .
+
+from pyme import core, constants
+import support
+
+support.init_gpgme(constants.PROTOCOL_OpenPGP)
+c = core.Context()
+c.set_armor(True)
+
+sink = core.Data()
+c.op_export_ext(['Alpha', 'Bob'], 0, sink)
+support.print_data(sink)
+
+# Again. Now using a key array.
+keys = []
+keys.append(c.get_key("0x68697734", False)) # Alpha
+keys.append(c.get_key("0xA9E3B0B2", False)) # Bob
+sink = core.Data()
+c.op_export_keys(keys, 0, sink)
+support.print_data(sink)
diff --git a/lang/python/tests/t-signers.py b/lang/python/tests/t-signers.py
new file mode 100755
index 00000000..26dded52
--- /dev/null
+++ b/lang/python/tests/t-signers.py
@@ -0,0 +1,75 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2016 g10 Code GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# GPGME is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, see .
+
+import sys
+from pyme import core, constants
+import support
+
+def check_result(r, typ):
+ if r.invalid_signers:
+ sys.exit("Invalid signer found: {}".format(r.invalid_signers.fpr))
+
+ if len(r.signatures) != 2:
+ sys.exit("Unexpected number of signatures created")
+
+ for signature in r.signatures:
+ if signature.type != typ:
+ sys.exit("Wrong type of signature created")
+
+ if signature.pubkey_algo != constants.PK_DSA:
+ sys.exit("Wrong pubkey algorithm reported: {}".format(
+ signature.pubkey_algo))
+
+ if signature.hash_algo != constants.MD_SHA1:
+ sys.exit("Wrong hash algorithm reported: {}".format(
+ signature.hash_algo))
+
+ if signature.sig_class != 1:
+ sys.exit("Wrong signature class reported: {}".format(
+ signature.sig_class))
+
+ if signature.fpr not in ("A0FF4590BB6122EDEF6E3C542D727CC768697734",
+ "23FD347A419429BACCD5E72D6BC4778054ACD246"):
+ sys.exit("Wrong fingerprint reported: {}".format(signature.fpr))
+
+
+support.init_gpgme(constants.PROTOCOL_OpenPGP)
+c = core.Context()
+c.set_textmode(True)
+c.set_armor(True)
+
+keys = []
+c.op_keylist_start('', True)
+keys.append(c.op_keylist_next())
+keys.append(c.op_keylist_next())
+c.op_keylist_end()
+
+c.signers_add(keys[0])
+c.signers_add(keys[1])
+
+for mode in (constants.SIG_MODE_NORMAL, constants.SIG_MODE_DETACH,
+ constants.SIG_MODE_CLEAR):
+ source = core.Data("Hallo Leute\n")
+ sink = core.Data()
+
+ c.op_sign(source, sink, mode)
+
+ result = c.op_sign_result()
+ check_result(result, mode)
+ support.print_data(sink)