From: Scott Date: Mon, 24 Jan 2022 21:57:51 +0000 (-0800) Subject: Finish up this coverage stuff. X-Git-Url: https://wannabe.guru.org/gitweb/?a=commitdiff_plain;h=298a4ff1dca7c75993eae2317a777829828ae04a;hp=48d6beaeef30d22e9366fdf7fa5d3311da66bf89;p=python_utils.git Finish up this coverage stuff. --- diff --git a/requirements.txt b/requirements.txt index 9962ad5..04d3ee7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,15 +1,15 @@ aiohttp -antlr4-python3-runtime +antlr4 - python3 - runtime bitstring cloudpickle coverage holidays nltk numpy -opencv-python +opencv - python overrides psutil -python-dateutil +python - dateutil pytype pytz readchar @@ -17,10 +17,10 @@ requests wheel astral grpcio -meross-iot +meross - iot pandas protobuf pychromecast pyserial -scikit-learn +scikit - learn SpeechRecognition diff --git a/tests/acl_test.py b/tests/acl_test.py index 1e9dcbf..a1d827e 100755 --- a/tests/acl_test.py +++ b/tests/acl_test.py @@ -4,17 +4,16 @@ import re import unittest import acl -import unittest_utils # Needed for --unittests_ignore_perf flag +import unittest_utils # Needed for --unittests_ignore_perf flag class TestSimpleACL(unittest.TestCase): - def test_set_based_acl(self): even = acl.SetBasedACL( - allow_set = set([2, 4, 6, 8, 10]), - deny_set = set([1, 3, 5, 7, 9]), - order_to_check_allow_deny = acl.Order.ALLOW_DENY, - default_answer = False + allow_set=set([2, 4, 6, 8, 10]), + deny_set=set([1, 3, 5, 7, 9]), + order_to_check_allow_deny=acl.Order.ALLOW_DENY, + default_answer=False, ) self.assertTrue(even(2)) self.assertFalse(even(3)) @@ -22,9 +21,9 @@ class TestSimpleACL(unittest.TestCase): def test_wildcard_based_acl(self): a_or_b = acl.StringWildcardBasedACL( - allowed_patterns = ['a*', 'b*'], - order_to_check_allow_deny = acl.Order.ALLOW_DENY, - default_answer = False + allowed_patterns=['a*', 'b*'], + order_to_check_allow_deny=acl.Order.ALLOW_DENY, + default_answer=False, ) self.assertTrue(a_or_b('aardvark')) self.assertTrue(a_or_b('baboon')) @@ -32,12 +31,9 @@ class TestSimpleACL(unittest.TestCase): def test_re_based_acl(self): weird = acl.StringREBasedACL( - denied_regexs = [ - re.compile('^a.*a$'), - re.compile('^b.*b$') - ], - order_to_check_allow_deny = acl.Order.DENY_ALLOW, - default_answer = True + denied_regexs=[re.compile('^a.*a$'), re.compile('^b.*b$')], + order_to_check_allow_deny=acl.Order.DENY_ALLOW, + default_answer=True, ) self.assertTrue(weird('aardvark')) self.assertFalse(weird('anaconda')) @@ -46,19 +42,19 @@ class TestSimpleACL(unittest.TestCase): def test_compound_acls_disjunction(self): a_b_c = acl.StringWildcardBasedACL( - allowed_patterns = ['a*', 'b*', 'c*'], - order_to_check_allow_deny = acl.Order.ALLOW_DENY, - default_answer = False + allowed_patterns=['a*', 'b*', 'c*'], + order_to_check_allow_deny=acl.Order.ALLOW_DENY, + default_answer=False, ) c_d_e = acl.StringWildcardBasedACL( - allowed_patterns = ['c*', 'd*', 'e*'], - order_to_check_allow_deny = acl.Order.ALLOW_DENY, - default_answer = False + allowed_patterns=['c*', 'd*', 'e*'], + order_to_check_allow_deny=acl.Order.ALLOW_DENY, + default_answer=False, ) disjunction = acl.AnyCompoundACL( - subacls = [a_b_c, c_d_e], - order_to_check_allow_deny = acl.Order.ALLOW_DENY, - default_answer = False, + subacls=[a_b_c, c_d_e], + order_to_check_allow_deny=acl.Order.ALLOW_DENY, + default_answer=False, ) self.assertTrue(disjunction('aardvark')) self.assertTrue(disjunction('caribou')) @@ -67,19 +63,19 @@ class TestSimpleACL(unittest.TestCase): def test_compound_acls_conjunction(self): a_b_c = acl.StringWildcardBasedACL( - allowed_patterns = ['a*', 'b*', 'c*'], - order_to_check_allow_deny = acl.Order.ALLOW_DENY, - default_answer = False + allowed_patterns=['a*', 'b*', 'c*'], + order_to_check_allow_deny=acl.Order.ALLOW_DENY, + default_answer=False, ) c_d_e = acl.StringWildcardBasedACL( - allowed_patterns = ['c*', 'd*', 'e*'], - order_to_check_allow_deny = acl.Order.ALLOW_DENY, - default_answer = False + allowed_patterns=['c*', 'd*', 'e*'], + order_to_check_allow_deny=acl.Order.ALLOW_DENY, + default_answer=False, ) conjunction = acl.AllCompoundACL( - subacls = [a_b_c, c_d_e], - order_to_check_allow_deny = acl.Order.ALLOW_DENY, - default_answer = False, + subacls=[a_b_c, c_d_e], + order_to_check_allow_deny=acl.Order.ALLOW_DENY, + default_answer=False, ) self.assertFalse(conjunction('aardvark')) self.assertTrue(conjunction('caribou')) diff --git a/tests/dict_utils_test.py b/tests/dict_utils_test.py index 9fb8157..a8f6273 100755 --- a/tests/dict_utils_test.py +++ b/tests/dict_utils_test.py @@ -3,11 +3,10 @@ import unittest import dict_utils as du -import unittest_utils # Needed for --unittests_ignore_perf flag +import unittest_utils # Needed for --unittests_ignore_perf flag class TestDictUtils(unittest.TestCase): - def test_init_or_inc(self): d = {} du.init_or_inc(d, 'a') @@ -20,41 +19,31 @@ class TestDictUtils(unittest.TestCase): du.init_or_inc(d, 'e') du.init_or_inc(d, 'a') du.init_or_inc(d, 'b') - e = { - 'a': 3, 'b': 3, 'c': 2, 'd': 1, 'e': 1 - } + e = {'a': 3, 'b': 3, 'c': 2, 'd': 1, 'e': 1} self.assertEqual(d, e) def test_shard_coalesce(self): - d = { - 'a': 3, 'b': 3, 'c': 2, 'd': 1, 'e': 1 - } + d = {'a': 3, 'b': 3, 'c': 2, 'd': 1, 'e': 1} shards = du.shard(d, 2) merged = du.coalesce(shards) self.assertEqual(d, merged) def test_item_with_max_value(self): - d = { - 'a': 4, 'b': 3, 'c': 2, 'd': 1, 'e': 1 - } + d = {'a': 4, 'b': 3, 'c': 2, 'd': 1, 'e': 1} self.assertEqual('a', du.item_with_max_value(d)[0]) self.assertEqual(4, du.item_with_max_value(d)[1]) self.assertEqual('a', du.key_with_max_value(d)) self.assertEqual(4, du.max_value(d)) def test_item_with_min_value(self): - d = { - 'a': 4, 'b': 3, 'c': 2, 'd': 1, 'e': 0 - } + d = {'a': 4, 'b': 3, 'c': 2, 'd': 1, 'e': 0} self.assertEqual('e', du.item_with_min_value(d)[0]) self.assertEqual(0, du.item_with_min_value(d)[1]) self.assertEqual('e', du.key_with_min_value(d)) self.assertEqual(0, du.min_value(d)) def test_min_max_key(self): - d = { - 'a': 4, 'b': 3, 'c': 2, 'd': 1, 'e': 0 - } + d = {'a': 4, 'b': 3, 'c': 2, 'd': 1, 'e': 0} self.assertEqual('a', du.min_key(d)) self.assertEqual('e', du.max_key(d))