1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83
|
--- a/tests/test_gpgmeh.py
+++ b/tests/test_gpgmeh.py
@@ -239,7 +239,7 @@
class TestKey1:
- def setup(self):
+ def setup_method(self):
data = read_fixture_file("pubkey-1.asc")
self.key = openpgpkey_from_data(data)
@@ -262,7 +262,7 @@
class TestGetPublicKeyData:
- def setup(self):
+ def setup_method(self):
self.fname = get_fixture_file("pubkey-1.asc")
original = open(self.fname, 'rb').read()
# This should be a new, empty directory
@@ -275,7 +275,7 @@
self.originalkey = openpgpkey_from_data(original)
- def teardown(self):
+ def teardown_method(self):
# shutil.rmtree(self.homedir)
pass
@@ -308,7 +308,7 @@
class TestGetUsableKeys:
- def setup(self):
+ def setup_method(self):
self.fname = get_fixture_file("pubkey-1.asc")
original = open(self.fname, 'rb').read()
# This should be a new, empty directory
@@ -321,7 +321,7 @@
self.originalkey = openpgpkey_from_data(original)
- def teardown(self):
+ def teardown_method(self):
# shutil.rmtree(self.homedir)
pass
@@ -340,7 +340,7 @@
class TestGetUsableSecretKeys:
- def setup(self):
+ def setup_method(self):
self.fname = get_fixture_file("seckey-no-pw-1.asc")
original = open(self.fname, 'rb').read()
# This should be a new, empty directory
@@ -353,7 +353,7 @@
self.originalkey = openpgpkey_from_data(original)
- def teardown(self):
+ def teardown_method(self):
# shutil.rmtree(self.homedir)
pass
@@ -417,7 +417,7 @@
SENDER_KEY = "seckey-no-pw-1.asc"
RECEIVER_KEY = "seckey-no-pw-2.asc"
- def setup(self):
+ def setup_method(self):
# The "sender" sends its certificate to have it certified by the receiver
self.key_sender_key = get_fixture_file(self.SENDER_KEY)
# The "receiver" will receive the certificate, certify it, and send it back to the "sender"
@@ -430,7 +430,7 @@
check_call(sender_gpgcmd + ["--import", self.key_sender_key])
check_call(receiver_gpgcmd + ["--import", self.key_receiver_key])
- def teardown(self):
+ def teardown_method(self):
# shutil.rmtree(self.sender_homedir)
# shutil.rmtree(self.receiver_homedir)
pass
|