ENGINE-209: intermittent commit to see if test failures from are from default merge ENGINE-209
authorKrista Bennett <krista@pep-project.org>
Wed, 24 May 2017 13:16:49 +0200
branchENGINE-209
changeset 1807795d1b201b6f
parent 1806 e65e979be062
child 1808 121361c60644
ENGINE-209: intermittent commit to see if test failures from are from default merge
test/apple_mail_test.cc
     1.1 --- a/test/apple_mail_test.cc	Mon May 22 09:57:49 2017 +0200
     1.2 +++ b/test/apple_mail_test.cc	Wed May 24 13:16:49 2017 +0200
     1.3 @@ -26,9 +26,13 @@
     1.4  
     1.5      const string keytextkey1 = slurp("test_keys/pub/pep-test-apple-0x1CCBC7D7_pub.asc");
     1.6      const string keytextkey2 = slurp("test_keys/priv/pep-test-recip-0x08DB0AEE_priv.asc");
     1.7 +    const string keytextkey3 = slurp("test_keys/priv/pep-test-apple-0x1CCBC7D7_priv.asc");
     1.8 +    const string keytextkey4 = slurp("test_keys/pub/pep-test-recip-0x08DB0AEE_pub.asc");
     1.9  
    1.10      PEP_STATUS statuskey1 = import_key(session, keytextkey1.c_str(), keytextkey1.length(), NULL);
    1.11      PEP_STATUS statuskey2 = import_key(session, keytextkey2.c_str(), keytextkey2.length(), NULL);
    1.12 +    PEP_STATUS statuskey3 = import_key(session, keytextkey3.c_str(), keytextkey3.length(), NULL);
    1.13 +    PEP_STATUS statuskey4 = import_key(session, keytextkey4.c_str(), keytextkey4.length(), NULL);
    1.14          
    1.15      const string mailtext = slurp(mailfile);
    1.16      pEp_identity * me = new_identity("pep.test.recip@kgrothoff.org", NULL, PEP_OWN_USERID, "pEp Test Recipient");