DandelionNStuff/dkimpy-smtputf8
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed read_test_data to suit test needs

Browse Source
This commit is contained in:
Spitap
2022-08-01 17:05:41 +02:00
parent fab181ae34
commit 0540d3cb17
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dkim/tests/test_dkim_generate.py
+8 -10
View File
@@ -24,12 +24,9 @@ import unittest
import dkim import dkim
import dknewkey import dknewkey
def read_test_data(filename): def read_data(path):
"""Get the content of the given test data file. """Get the content of the given test data file."""
The files live in dkim/tests/data.
"""
path = os.path.join(os.path.dirname(__file__), 'data', filename)
with open(path, 'rb') as f: with open(path, 'rb') as f:
return f.read() return f.read()
@@ -38,7 +35,8 @@ class TestSignAndVerify(unittest.TestCase):
"""End-to-end signature and verification tests with a generated key.""" """End-to-end signature and verification tests with a generated key."""
def setUp(self): def setUp(self):
self.message = read_test_data("test.message") message_dir = os.path.join(os.path.dirname(__file__), 'data', "test.message")
self.message = read_data(message_dir)
self.ed25519_dns_key_file = "" self.ed25519_dns_key_file = ""
self.rsa_dns_key_file = "" self.rsa_dns_key_file = ""
@@ -53,7 +51,7 @@ class TestSignAndVerify(unittest.TestCase):
dknewkey.GenRSAKeys(rsa_key_file, False) dknewkey.GenRSAKeys(rsa_key_file, False)
dknewkey.ExtractRSADnsPublicKey(rsa_key_file, self.rsa_dns_key_file, False) dknewkey.ExtractRSADnsPublicKey(rsa_key_file, self.rsa_dns_key_file, False)
#Load the key #Load the key
rsakey = read_test_data(rsa_key_file) rsakey = read_data(rsa_key_file)
#Test signature with the newely generated key #Test signature with the newely generated key
for header_algo in (b"simple", b"relaxed"): for header_algo in (b"simple", b"relaxed"):
for body_algo in (b"simple", b"relaxed"): for body_algo in (b"simple", b"relaxed"):
@@ -74,7 +72,7 @@ class TestSignAndVerify(unittest.TestCase):
pkt = dknewkey.GenEd25519Keys(ed25519_key_file, False) pkt = dknewkey.GenEd25519Keys(ed25519_key_file, False)
dknewkey.ExtractEd25519PublicKey(self.ed25519_dns_key_file, pkt, False) dknewkey.ExtractEd25519PublicKey(self.ed25519_dns_key_file, pkt, False)
#Load the key #Load the key
ed25519key = read_test_data(ed25519_key_file) ed25519key = read_data(ed25519_key_file)
#Test signature with the newely generated key #Test signature with the newely generated key
for header_algo in (b"simple", b"relaxed"): for header_algo in (b"simple", b"relaxed"):
for body_algo in (b"simple", b"relaxed"): for body_algo in (b"simple", b"relaxed"):
@@ -88,7 +86,7 @@ class TestSignAndVerify(unittest.TestCase):
def dnsfuncRSA(self, domain, timeout=5): def dnsfuncRSA(self, domain, timeout=5):
_dns_responses = { _dns_responses = {
'test._domainkey.example.com.': read_test_data(self.rsa_dns_key_file), 'test._domainkey.example.com.': read_data(self.rsa_dns_key_file),
} }
try: try:
domain = domain.decode('ascii') domain = domain.decode('ascii')
@@ -99,7 +97,7 @@ class TestSignAndVerify(unittest.TestCase):
def dnsfuncED25519(self, domain, timeout=5): def dnsfuncED25519(self, domain, timeout=5):
_dns_responses = { _dns_responses = {
'test1._domainkey.example.com.': read_test_data(self.ed25519_dns_key_file), 'test1._domainkey.example.com.': read_data(self.ed25519_dns_key_file),
} }
try: try:
domain = domain.decode('ascii') domain = domain.decode('ascii')