[git] GPGME - branch, aheinecke/json-test, updated. gpgme-1.12.0-65-gdef030e
by Andre Heinecke
cvs at cvs.gnupg.org
Wed Nov 14 17:22:31 CET 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".
The branch, aheinecke/json-test has been updated
via def030e843bd4576597272abe9fe12f846066576 (commit)
via d0087d45f0207bf82a4f078d972c28c4d1cd2690 (commit)
from 88b7221eb737a3102ec61ea385990b7ea7ef2b30 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit def030e843bd4576597272abe9fe12f846066576
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Nov 14 17:21:24 2018 +0100
tests,json: Fix distcheck
* tests/json/Makefile.am (EXTRA_DIST): Add inital and final scripts.
(t_json_SOURCES): Don't use cJSON.o as source.
diff --git a/tests/json/Makefile.am b/tests/json/Makefile.am
index 74c9c3e..b4e1698 100644
--- a/tests/json/Makefile.am
+++ b/tests/json/Makefile.am
@@ -43,7 +43,8 @@ private_keys = \
$(top_srcdir)/tests/gpg/7A030357C0F253A5BBCD282FFC4E521B37558F5C
-EXTRA_DIST = t-chunking.in.json t-chunking.out.json \
+EXTRA_DIST = initial.test final.test \
+ t-chunking.in.json t-chunking.out.json \
t-config.in.json t-config-opt.in.json \
t-config-opt.out.json t-config.out.json \
t-createkey.in.json t-createkey.out.json \
@@ -63,7 +64,7 @@ EXTRA_DIST = t-chunking.in.json t-chunking.out.json \
BUILT_SOURCES = gpg.conf gpg-agent.conf pubring-stamp \
gpg-sample.stamp
-t_json_SOURCES = t-json.c ../../src/cJSON.o
+t_json_SOURCES = t-json.c
AM_LDFLAGS = -no-install
LDADD = ../../src/libgpgme.la
t_json_LDADD = ../../src/cJSON.o -lm ../../src/libgpgme.la @GPG_ERROR_LIBS@
commit d0087d45f0207bf82a4f078d972c28c4d1cd2690
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Nov 14 17:05:25 2018 +0100
tests,json: Add more tests
* t-config-opt.in.json,
t-config-opt.out.json,
t-import.in.json,
t-import.out.json,
t-sign.in.json,
t-sign.out.json: New.
--
These should actually have been in a previous commit as
they are already registered.
diff --git a/tests/json/t-config-opt.in.json b/tests/json/t-config-opt.in.json
new file mode 100644
index 0000000..b949803
--- /dev/null
+++ b/tests/json/t-config-opt.in.json
@@ -0,0 +1,5 @@
+{
+ "op": "config_opt",
+ "component": "gpg",
+ "option": "default-key"
+}
diff --git a/tests/json/t-config-opt.out.json b/tests/json/t-config-opt.out.json
new file mode 100644
index 0000000..57f1158
--- /dev/null
+++ b/tests/json/t-config-opt.out.json
@@ -0,0 +1,6 @@
+{
+ "option": {
+ "name": "default-key",
+ "argname": "NAME"
+ }
+}
diff --git a/tests/json/t-import.in.json b/tests/json/t-import.in.json
new file mode 100644
index 0000000..20b94f0
--- /dev/null
+++ b/tests/json/t-import.in.json
@@ -0,0 +1,4 @@
+{
+ "op": "import",
+ "data": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQGiBDbjs5oRBACjAxqGzA6j190iiN/1vJvS5jYLQ1H3xxhzXdZ6ZxjPJkslX1ox\nFqBINhjzBJnV9/7b1FFe5089NiCcGUVZa2xD3Vu+niLTAGNTQeNy6Y0E6wEfvplQ\nLJbpVGOmuVeZyShHNCKjrsZFtS1mr7o19SUb5QWS3gZHabFTbmhibcFBXwCg36qG\nVAnGcZzvnUTGpRy3xjp+zuED/2qTJNpnPhicKSksVwb6EJFXH7mQSZlyblAnOAVF\nMx19GUijW4MWP5FUdcTd5KzIDgkenRLBrpCLIFVkQ4/baP/hOiCLOmCoRu3xnFyo\nRPM/Jn94Qy3Jo2wigwkhQU+zyOU5C85QBD9ctkbYp/0mu9bpxmYTchHwD1v3dXUX\nEVajA/9lnEz1GiI0bwKpm8VKXp0YYP5hea8Jh5fNVb1QW2QqGd+XNHnRGSqX5smG\nyrs+xoYxD8+jv1FhmGaSv+6+n+JBVK4TuWrQpZ0cgZL5jZnX27TOYXeY4d5YKgE+\n7ZO57TwCIfF/P6puflGm+t5GcFwj4kkfohMEaeNhm1S+xf29q7QrVmljdG9yIFRl\nc3QgKGRlbW8ga2V5KSA8dmljdG9yQGV4YW1wbGUub3JnPohVBBMRAgAVBQI247Oa\nAwsKAwMVAwIDFgIBAheAAAoJEEevS2lh8EeEzEkAoMA+KfY9bA8EdfvWwa8zUM1S\nMs5rAKDS+6X3HVuCaLtVxzXOob+DKbB7b7kBDQQ247O+EAQAh5FAgdvaTJL3jBGc\njYiiJosxeTWf3L/dUY99fZN8R39DSVoUKf9Rt/EsS5DywXVnKAeJiUTYw8lbMRVF\n70VhSDHpMC9KtbB0lk3CcAqULPiyirT5g9ywN24W7k0naWIJisttUh+Hqbm6gc5P\nz9Nfd5ll8x4Ehi3lKE6Nze3gUNMAAwUD/AtUN1hqwWTTphVZctHq3JaUEb9agmu/\nOcsf24/bq9i8R8FaMwBF4fI5qIimcqAM+2BZ6dvZEdqrVaZR9aHjzchcHmaiI7Zm\nW4gmk+LHFFWf9y7mG8YDKFBXkaBuJpxFb1FIfJpmaLzJmRa76dLqI3A7H2E8dFQa\n/MGsYCa4NmILiEUEGBECAAYFAjbjs74ACgkQR69LaWHwR4RT3QCgnMlRAiGtvL5l\nD4Gdo5F0KEP5zZEAlA6Ri9WmZ9Xiqw5R3Bsg+As8sJ4=\n=FRd4\n-----END PGP PUBLIC KEY BLOCK-----\n"
+}
diff --git a/tests/json/t-import.out.json b/tests/json/t-import.out.json
new file mode 100644
index 0000000..1f029af
--- /dev/null
+++ b/tests/json/t-import.out.json
@@ -0,0 +1,22 @@
+{
+ "result": {
+ "considered": 1,
+ "no_user_id": 0,
+ "imported_rsa": 0,
+ "new_user_ids": 0,
+ "new_sub_keys": 0,
+ "new_signatures": 0,
+ "new_revocations": 0,
+ "secret_read": 0,
+ "secret_imported": 0,
+ "secret_unchanged": 0,
+ "skipped_new_keys": 0,
+ "not_imported": 0,
+ "skipped_v3_keys": 0,
+ "imports": [{
+ "fingerprint": "E8143C489C8D41124DC40D0B47AF4B6961F04784",
+ "error_string": "Success",
+ "status": 1
+ }]
+ }
+}
diff --git a/tests/json/t-sign.in.json b/tests/json/t-sign.in.json
new file mode 100644
index 0000000..9e04442
--- /dev/null
+++ b/tests/json/t-sign.in.json
@@ -0,0 +1,8 @@
+{
+ "op": "sign",
+ "keys": "A0FF4590BB6122EDEF6E3C542D727CC768697734",
+ "sender": "alpha at example.net",
+ "data": "Hello world",
+ "armor": true,
+ "base64": false
+}
diff --git a/tests/json/t-sign.out.json b/tests/json/t-sign.out.json
new file mode 100644
index 0000000..37d7f68
--- /dev/null
+++ b/tests/json/t-sign.out.json
@@ -0,0 +1,5 @@
+{
+ "type": "signature",
+ "base64": false,
+ "data": "*"
+}
-----------------------------------------------------------------------
Summary of changes:
tests/json/Makefile.am | 5 +++--
tests/json/t-config-opt.in.json | 5 +++++
tests/json/t-config-opt.out.json | 6 ++++++
tests/json/t-import.in.json | 4 ++++
tests/json/t-import.out.json | 22 ++++++++++++++++++++++
tests/json/t-sign.in.json | 8 ++++++++
tests/json/t-sign.out.json | 5 +++++
7 files changed, 53 insertions(+), 2 deletions(-)
create mode 100644 tests/json/t-config-opt.in.json
create mode 100644 tests/json/t-config-opt.out.json
create mode 100644 tests/json/t-import.in.json
create mode 100644 tests/json/t-import.out.json
create mode 100644 tests/json/t-sign.in.json
create mode 100644 tests/json/t-sign.out.json
hooks/post-receive
--
GnuPG Made Easy
http://git.gnupg.org
More information about the Gnupg-commits
mailing list