diff options
Diffstat (limited to 'lang/python/tests/t-keylist-from-data.py')
| -rwxr-xr-x | lang/python/tests/t-keylist-from-data.py | 90 | 
1 files changed, 46 insertions, 44 deletions
diff --git a/lang/python/tests/t-keylist-from-data.py b/lang/python/tests/t-keylist-from-data.py index f82ca842..4fd9ba08 100755 --- a/lang/python/tests/t-keylist-from-data.py +++ b/lang/python/tests/t-keylist-from-data.py @@ -162,18 +162,18 @@ def check_global(key, uids, n_subkeys):      assert key.can_sign, "Key unexpectedly unusable for signing"      assert key.can_certify, "Key unexpectedly unusable for certifications"      assert not key.secret, "Key unexpectedly secret" -    assert not key.protocol != gpg.constants.protocol. -    OpenPGP, "Key has unexpected protocol: {}".format(key.protocol) -    assert not key.issuer_serial, -    "Key unexpectedly carries issuer serial: {}".format(key.issuer_serial) -    assert not key.issuer_name, -    "Key unexpectedly carries issuer name: {}".format(key.issuer_name) -    assert not key.chain_id, -    "Key unexpectedly carries chain ID: {}".format(key.chain_id) -    assert key.owner_trust == gpg.constants.validity.UNKNOWN, -    "Key has unexpected owner trust: {}".format(key.owner_trust) -    assert len(key.subkeys) - 1 == n_subkeys, -    "Key `{}' has unexpected number of subkeys".format(uids[0][0]) +    assert not key.protocol != gpg.constants.protocol.OpenPGP, \ +        "Key has unexpected protocol: {}".format(key.protocol) +    assert not key.issuer_serial, \ +        "Key unexpectedly carries issuer serial: {}".format(key.issuer_serial) +    assert not key.issuer_name, \ +        "Key unexpectedly carries issuer name: {}".format(key.issuer_name) +    assert not key.chain_id, \ +        "Key unexpectedly carries chain ID: {}".format(key.chain_id) +    assert key.owner_trust == gpg.constants.validity.UNKNOWN, \ +        "Key has unexpected owner trust: {}".format(key.owner_trust) +    assert len(key.subkeys) - 1 == n_subkeys, \ +        "Key `{}' has unexpected number of subkeys".format(uids[0][0])  def check_subkey(fpr, which, subkey): @@ -183,49 +183,51 @@ def check_subkey(fpr, which, subkey):      assert not subkey.invalid, which + " key unexpectedly invalid"      if which == "Primary": -        assert not subkey.can_encrypt, -        which + " key unexpectedly usable for encryption" -        assert subkey.can_sign, -        which + " key unexpectedly unusable for signing" -        assert subkey.can_certify, -        which + " key unexpectedly unusable for certifications" +        assert not subkey.can_encrypt, \ +            which + " key unexpectedly usable for encryption" +        assert subkey.can_sign, \ +            which + " key unexpectedly unusable for signing" +        assert subkey.can_certify, \ +            which + " key unexpectedly unusable for certifications"      else: -        assert subkey.can_encrypt, -        which + " key unexpectedly unusable for encryption" -        assert not subkey.can_sign, -        which + " key unexpectedly usable for signing" -        assert not subkey.can_certify, -        which + " key unexpectedly usable for certifications" +        assert subkey.can_encrypt, \ +            which + " key unexpectedly unusable for encryption" +        assert not subkey.can_sign, \ +            which + " key unexpectedly usable for signing" +        assert not subkey.can_certify, \ +            which + " key unexpectedly usable for certifications"      assert not subkey.secret, which + " key unexpectedly secret"      assert not subkey.is_cardkey, "Public key marked as card key"      assert not subkey.card_number, "Public key with card number set" -    assert not subkey.pubkey_algo != -    (gpg.constants.pk.DSA if which == "Primary" else gpg.constants.pk.ELG_E), -    which + " key has unexpected public key algo: {}".format(subkey. -                                                             pubkey_algo) -    assert subkey.length == 1024, -    which + " key has unexpected length: {}".format(subkey.length) -    assert fpr.endswith(subkey.keyid), -    which + " key has unexpected key ID: {}".format(subkey.keyid) -    assert which == "Secondary" or subkey.fpr == fpr, -    which + " key has unexpected fingerprint: {}".format(subkey.fpr) -    assert not subkey.expires, -    which + " key unexpectedly expires: {}".format(subkey.expires) +    assert not subkey.pubkey_algo != \ +        (gpg.constants.pk.DSA if which == "Primary" +         else gpg.constants.pk.ELG_E), \ +         which + " key has unexpected public key algo: {}".format(subkey. +                                                                  pubkey_algo) +    assert subkey.length == 1024, \ +        which + " key has unexpected length: {}".format(subkey.length) +    assert fpr.endswith(subkey.keyid), \ +        which + " key has unexpected key ID: {}".format(subkey.keyid) +    assert which == "Secondary" or subkey.fpr == fpr, \ +        which + " key has unexpected fingerprint: {}".format(subkey.fpr) +    assert not subkey.expires, \ +        which + " key unexpectedly expires: {}".format(subkey.expires)  def check_uid(which, ref, uid):      assert not uid.revoked, which + " user ID unexpectedly revoked"      assert not uid.invalid, which + " user ID unexpectedly invalid" -    assert uid.validity == gpg.constants.validity.UNKNOWN, -    which + " user ID has unexpected validity: {}".format(uid.validity) +    assert uid.validity == gpg.constants.validity.UNKNOWN, \ +        which + " user ID has unexpected validity: {}".format(uid.validity)      assert not uid.signatures, which + " user ID unexpectedly signed" -    assert uid.name == ref[0], -    "Unexpected name in {} user ID: {!r}".format(which.lower(), uid.name) -    assert uid.comment == ref[1], -    "Unexpected comment in {} user ID: {!r}".format(which.lower(), uid.comment) -    assert uid.email == ref[2], -    "Unexpected email in {} user ID: {!r}".format(which.lower(), uid.email) +    assert uid.name == ref[0], \ +        "Unexpected name in {} user ID: {!r}".format(which.lower(), uid.name) +    assert uid.comment == ref[1], \ +        "Unexpected comment in {} user ID: {!r}".format(which.lower(), +                                                        uid.comment) +    assert uid.email == ref[2], \ +        "Unexpected email in {} user ID: {!r}".format(which.lower(), uid.email)  # Export all the data from our keyring...  | 
