From e544c6fa9e15e7277da79e2464243e90b2706b8c Mon Sep 17 00:00:00 2001 From: StevenWdV Date: Mon, 24 Jan 2022 14:59:25 +0100 Subject: Cleanup Added variables to Makefiles to specify custom exports/ directory; Split exception classes in Java & C#; Added more comments; Renamed library and Go package; Removed real (pure) tests; Added generate_lib.ps1 to generate import .lib for Windows (Swift); Moved built Go libraries to exports/lib/; Switch to hopefully faster Swift GitHub Action. --- wrappers/python/test_discovery.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'wrappers/python/test_discovery.py') diff --git a/wrappers/python/test_discovery.py b/wrappers/python/test_discovery.py index 1282a3e..73c51c4 100755 --- a/wrappers/python/test_discovery.py +++ b/wrappers/python/test_discovery.py @@ -14,21 +14,21 @@ def read_bytes(path: str) -> bytes: class VerifyTests(unittest.TestCase): @classmethod def setUpClass(cls) -> None: - with open(f"{test_data_dir}/dummy/public.key") as f: + with open(f"{test_data_dir}/public.key") as f: discovery._insecure_testing_set_extra_key(f.readlines()[-1][:-1]) def testValid(self): discovery.verify( - read_bytes(f"{test_data_dir}/dummy/server_list.json.minisig"), - read_bytes(f"{test_data_dir}/dummy/server_list.json"), + read_bytes(f"{test_data_dir}/server_list.json.minisig"), + read_bytes(f"{test_data_dir}/server_list.json"), "server_list.json", 0 ) def testValidMemoryView(self): discovery.verify( - read_bytes(f"{test_data_dir}/dummy/server_list.json.minisig"), - memoryview(b"abc" + read_bytes(f"{test_data_dir}/dummy/server_list.json") + b"abc")[3:-3], + read_bytes(f"{test_data_dir}/server_list.json.minisig"), + memoryview(b"abc" + read_bytes(f"{test_data_dir}/server_list.json") + b"abc")[3:-3], "server_list.json", 0 ) @@ -36,8 +36,8 @@ class VerifyTests(unittest.TestCase): def testInvalidSignature(self): with self.assertRaises(discovery.VerifyError) as ctx: discovery.verify( - read_bytes(f"{test_data_dir}/dummy/random.txt"), - read_bytes(f"{test_data_dir}/dummy/server_list.json"), + read_bytes(f"{test_data_dir}/random.txt"), + read_bytes(f"{test_data_dir}/server_list.json"), "server_list.json", 0 ) @@ -46,8 +46,8 @@ class VerifyTests(unittest.TestCase): def testWrongKey(self): with self.assertRaises(discovery.VerifyError) as ctx: discovery.verify( - read_bytes(f"{test_data_dir}/dummy/server_list.json.wrong_key.minisig"), - read_bytes(f"{test_data_dir}/dummy/server_list.json"), + read_bytes(f"{test_data_dir}/server_list.json.wrong_key.minisig"), + read_bytes(f"{test_data_dir}/server_list.json"), "server_list.json", 0 ) @@ -56,8 +56,8 @@ class VerifyTests(unittest.TestCase): def testOldSignature(self): with self.assertRaises(discovery.VerifyError) as ctx: discovery.verify( - read_bytes(f"{test_data_dir}/dummy/server_list.json.minisig"), - read_bytes(f"{test_data_dir}/dummy/server_list.json"), + read_bytes(f"{test_data_dir}/server_list.json.minisig"), + read_bytes(f"{test_data_dir}/server_list.json"), "server_list.json", 1 << 31 ) @@ -66,8 +66,8 @@ class VerifyTests(unittest.TestCase): def TestUnknownExpectedFile(self): with self.assertRaises(discovery.VerifyError) as ctx: discovery.verify( - read_bytes(f"{test_data_dir}/dummy/other_list.json.minisig"), - read_bytes(f"{test_data_dir}/dummy/other_list.json"), + read_bytes(f"{test_data_dir}/other_list.json.minisig"), + read_bytes(f"{test_data_dir}/other_list.json"), "other_list.json", 0 ) -- cgit v1.2.3