diff options
| author | Justus Winter <[email protected]> | 2016-10-31 14:28:26 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2016-10-31 14:42:35 +0000 |
| commit | 4b3264345084a0c9bf9f97fb233df700d7608e66 (patch) | |
| tree | cecaf14d620fee63b54de2d095dca4b24a79d51d /lang/python/tests/t-verify.py | |
| parent | python: Import the topmost module in tests and examples. (diff) | |
| download | gpgme-4b3264345084a0c9bf9f97fb233df700d7608e66.tar.gz gpgme-4b3264345084a0c9bf9f97fb233df700d7608e66.zip | |
python: Use vanity modules for constants in tests and examples.
* lang/python/gpg/constants/sig/notation.py: New file.
* lang/python/gpg/constants/sig/__init__.py: Import new module.
* lang/python/examples/assuan.py: Use more specific module for
constants, e.g. 'protocol.ASSUAN' instead of 'PROTOCOL_ASSUAN'.
* lang/python/examples/testCMSgetkey.py: Likewise.
* lang/python/tests/initial.py: Likewise.
* lang/python/tests/t-callbacks.py: Likewise.
* lang/python/tests/t-decrypt-verify.py: Likewise.
* lang/python/tests/t-decrypt.py: Likewise.
* lang/python/tests/t-edit.py: Likewise.
* lang/python/tests/t-encrypt-large.py: Likewise.
* lang/python/tests/t-encrypt-sign.py: Likewise.
* lang/python/tests/t-encrypt-sym.py: Likewise.
* lang/python/tests/t-encrypt.py: Likewise.
* lang/python/tests/t-export.py: Likewise.
* lang/python/tests/t-file-name.py: Likewise.
* lang/python/tests/t-idiomatic.py: Likewise.
* lang/python/tests/t-import.py: Likewise.
* lang/python/tests/t-keylist.py: Likewise.
* lang/python/tests/t-protocol-assuan.py: Likewise.
* lang/python/tests/t-sig-notation.py: Likewise.
* lang/python/tests/t-sign.py: Likewise.
* lang/python/tests/t-signers.py: Likewise.
* lang/python/tests/t-trustlist.py: Likewise.
* lang/python/tests/t-verify.py: Likewise.
* lang/python/tests/t-wait.py: Likewise.
Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to 'lang/python/tests/t-verify.py')
| -rwxr-xr-x | lang/python/tests/t-verify.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lang/python/tests/t-verify.py b/lang/python/tests/t-verify.py index ddfa2ced..f18e1ddc 100755 --- a/lang/python/tests/t-verify.py +++ b/lang/python/tests/t-verify.py @@ -98,7 +98,7 @@ def check_result(result, summary, validity, fpr, status, notation): assert gpg.errors.GPGMEError(sig.validity_reason).getcode() == gpg.errors.NO_ERROR -support.init_gpgme(gpg.constants.PROTOCOL_OpenPGP) +support.init_gpgme(gpg.constants.protocol.OpenPGP) c = gpg.Context() c.set_armor(True) @@ -107,8 +107,8 @@ text = gpg.Data(test_text1) sig = gpg.Data(test_sig1) c.op_verify(sig, text, None) result = c.op_verify_result() -check_result(result, gpg.constants.SIGSUM_VALID | gpg.constants.SIGSUM_GREEN, - gpg.constants.VALIDITY_FULL, +check_result(result, gpg.constants.sigsum.VALID | gpg.constants.sigsum.GREEN, + gpg.constants.validity.FULL, "A0FF4590BB6122EDEF6E3C542D727CC768697734", gpg.errors.NO_ERROR, True) @@ -118,7 +118,7 @@ text = gpg.Data(test_text1f) sig.seek(0, os.SEEK_SET) c.op_verify(sig, text, None) result = c.op_verify_result() -check_result(result, gpg.constants.SIGSUM_RED, gpg.constants.VALIDITY_UNKNOWN, +check_result(result, gpg.constants.sigsum.RED, gpg.constants.validity.UNKNOWN, "2D727CC768697734", gpg.errors.BAD_SIGNATURE, False) # Checking a normal signature. @@ -126,8 +126,8 @@ text = gpg.Data() sig = gpg.Data(test_sig2) c.op_verify(sig, None, text) result = c.op_verify_result() -check_result(result, gpg.constants.SIGSUM_VALID | gpg.constants.SIGSUM_GREEN, - gpg.constants.VALIDITY_FULL, +check_result(result, gpg.constants.sigsum.VALID | gpg.constants.sigsum.GREEN, + gpg.constants.validity.FULL, "A0FF4590BB6122EDEF6E3C542D727CC768697734", gpg.errors.NO_ERROR, False) @@ -147,8 +147,8 @@ else: with gpg.Context(armor=True) as c: # Checking a valid message. _, result = c.verify(test_text1, test_sig1) - check_result(result, gpg.constants.SIGSUM_VALID | gpg.constants.SIGSUM_GREEN, - gpg.constants.VALIDITY_FULL, + check_result(result, gpg.constants.sigsum.VALID | gpg.constants.sigsum.GREEN, + gpg.constants.validity.FULL, "A0FF4590BB6122EDEF6E3C542D727CC768697734", gpg.errors.NO_ERROR, True) @@ -156,8 +156,8 @@ with gpg.Context(armor=True) as c: try: c.verify(test_text1f, test_sig1) except gpg.errors.BadSignatures as e: - check_result(e.result, gpg.constants.SIGSUM_RED, - gpg.constants.VALIDITY_UNKNOWN, + check_result(e.result, gpg.constants.sigsum.RED, + gpg.constants.validity.UNKNOWN, "2D727CC768697734", gpg.errors.BAD_SIGNATURE, False) else: assert False, "Expected an error but got none." @@ -165,8 +165,8 @@ with gpg.Context(armor=True) as c: # Checking a normal signature. sig = gpg.Data(test_sig2) data, result = c.verify(test_sig2) - check_result(result, gpg.constants.SIGSUM_VALID | gpg.constants.SIGSUM_GREEN, - gpg.constants.VALIDITY_FULL, + check_result(result, gpg.constants.sigsum.VALID | gpg.constants.sigsum.GREEN, + gpg.constants.validity.FULL, "A0FF4590BB6122EDEF6E3C542D727CC768697734", gpg.errors.NO_ERROR, False) assert data == test_text1 |