From 627d2801d820c9dcd791b551cbfa874931398951 Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Tue, 3 May 2022 16:24:45 +0200 Subject: Python: Remove obsolete code --- wrappers/python/eduvpncommon/error.py | 14 ------- wrappers/python/test_discovery.py | 78 ----------------------------------- 2 files changed, 92 deletions(-) delete mode 100644 wrappers/python/eduvpncommon/error.py delete mode 100755 wrappers/python/test_discovery.py (limited to 'wrappers') diff --git a/wrappers/python/eduvpncommon/error.py b/wrappers/python/eduvpncommon/error.py deleted file mode 100644 index 59f0607..0000000 --- a/wrappers/python/eduvpncommon/error.py +++ /dev/null @@ -1,14 +0,0 @@ -from enum import Enum - - -class GoError(Exception): - message_dict: dict - code: Enum - - def __init__(self, err: Enum, messages: dict): - assert err - self.code = err - self.message_dict = messages - - def __str__(self): - return self.message_dict[self.code] diff --git a/wrappers/python/test_discovery.py b/wrappers/python/test_discovery.py deleted file mode 100755 index a1a70af..0000000 --- a/wrappers/python/test_discovery.py +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/env python3 - -import unittest -import eduvpncommon.discovery as discovery - -test_data_dir = "../../src/test_data" - - -def read_bytes(path: str) -> bytes: - with open(path, "rb") as f: - return f.read() - - -class VerifyTests(unittest.TestCase): - @classmethod - def setUpClass(cls) -> None: - 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}/server_list.json.minisig"), - read_bytes(f"{test_data_dir}/server_list.json"), - "server_list.json", - 10 - ) - - def testValidMemoryView(self): - discovery.verify( - 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 - ) - - def testInvalidSignature(self): - with self.assertRaises(discovery.VerifyError) as ctx: - discovery.verify( - read_bytes(f"{test_data_dir}/random.txt"), - read_bytes(f"{test_data_dir}/server_list.json"), - "server_list.json", - 0 - ) - self.assertEqual(ctx.exception.code, discovery.VerifyErrorCode.ErrInvalidSignature) - - def testWrongKey(self): - with self.assertRaises(discovery.VerifyError) as ctx: - discovery.verify( - 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 - ) - self.assertEqual(ctx.exception.code, discovery.VerifyErrorCode.ErrInvalidSignatureUnknownKey) - - def testOldSignature(self): - with self.assertRaises(discovery.VerifyError) as ctx: - discovery.verify( - read_bytes(f"{test_data_dir}/server_list.json.minisig"), - read_bytes(f"{test_data_dir}/server_list.json"), - "server_list.json", - 11 - ) - self.assertEqual(ctx.exception.code, discovery.VerifyErrorCode.ErrTooOld) - - def TestUnknownExpectedFile(self): - with self.assertRaises(discovery.VerifyError) as ctx: - discovery.verify( - read_bytes(f"{test_data_dir}/other_list.json.minisig"), - read_bytes(f"{test_data_dir}/other_list.json"), - "other_list.json", - 0 - ) - self.assertEqual(ctx.exception.code, discovery.VerifyErrorCode.ErrUnknownExpectedFileName) - - -if __name__ == "__main__": - unittest.main() -- cgit v1.2.3