@ -40,20 +40,21 @@ def tmpdir(tmpdir_factory, request):
@pytest.fixture ( )
def alice_sec_key_data ( datadir ) :
key_data = datadir . read ( " alice@openpgp.example.sec.asc " )
def alice_sec_key_path ( datadir ) :
key_data = datadir . basepath . join ( " alice@openpgp.example.sec.asc " )
return key_data
@pytest.fixture ( )
def bob_sec_key_data ( datadir ) :
key_data = datadir . read ( " bob@openpgp.example.sec.asc " )
def bob_sec_key_path ( datadir ) :
key_data = datadir . basepath . join ( " bob@openpgp.example.sec.asc " )
print ( type ( key_data ) )
return key_data
@pytest.fixture ( )
def carol_sec_key_data ( datadir ) :
key_data = datadir . read ( " carol@openpgp.example.sec.asc " )
def carol_sec_key_path ( datadir ) :
key_data = datadir . basepath . join ( " carol@openpgp.example.sec.asc " )
return key_data
@ -83,21 +84,16 @@ def email_from_bob_to_carol(datadir):
@pytest.fixture ( scope = " function " )
def set_env ( tmpdir ) :
common . set_env ( str ( tmpdir ) )
return common . set_env ( str ( tmpdir ) )
@pytest.fixture ( scope = " function " )
def import_keys (
set_env , bob_sec_key_data , alice_sec_key_data , carol_sec_key_data , datadir
set_env , bob_sec_key_path , alice_sec_key_path , carol_sec_key_path , datadir
) :
import pEp
pEp . import_key ( alice_sec_key_data )
pEp . import_key ( bob_sec_key_data )
pEp . import_key ( carol_sec_key_data )
pEp . import_key ( datadir . read ( " root@n1.pep.example.sec.asc " ) )
pEp . import_key ( datadir . read ( " root@n2.pep.example.sec.asc " ) )
pEp . import_key ( datadir . read ( " root@n3.pep.example.sec.asc " ) )
common . import_keys (
[ bob_sec_key_path , alice_sec_key_path , carol_sec_key_path ]
)
@pytest.fixture ( )
@ -108,10 +104,12 @@ def email_encrypted_from_alice_to_n3(datadir):
@pytest.fixture ( scope = " function " )
def import_public_keys ( set_env , datadir ) :
import pEp
# XXX: Add alice's key
pEp . import_key ( datadir . read ( " bob@openpgp.example.asc " ) )
pEp . import_key ( datadir . read ( " root@n1.pep.example.asc " ) )
pEp . import_key ( datadir . read ( " root@n2.pep.example.asc " ) )
pEp . import_key ( datadir . read ( " root@n3.pep.example.asc " ) )
common . import_keys (
[
datadir . basepath . join ( " bob@openpgp.example.asc " ) ,
datadir . basepath . join ( " root@n1.pep.example.asc " ) ,
datadir . basepath . join ( " root@n2.pep.example.asc " ) ,
datadir . basepath . join ( " root@n3.pep.example.asc " ) ,
]
)