fix problem with tests

Author: KsanaKozlova

numba_typing/tests/test_type_annotations.py

@@ -3,6 +3,15 @@
 from typing import Union, Dict, List, TypeVar
 
 
+def check_equal(result, expected):
+    if len(result) != len(expected):
+        return False
+    for sig in result:
+        if sig not in expected:
+            return False
+    return True
+
+
 class TestTypeAnnotations(unittest.TestCase):
 
     def test_get_func_annotations_exceptions(self):
@@ -46,17 +55,6 @@ def func_three(a: Dict[int, str], b: str = "string", c: int = 1):
             with self.subTest(func=f.__name__):
                 self.assertEqual(type_annotations.get_func_annotations(f), expected)
 
-    '''    def test_product_annotations(self):
-
-        S = TypeVar('S', float, str)
-        annotations = ({'a': [int], 'b': [int, float], 'c': [S]}, {})
-        result = type_annotations.product_annotations(annotations)
-        expected = [[{'a': int, 'b': int, 'c': float}, {}],
-                    [{'a': int, 'b': int, 'c': str}, {}],
-                    [{'a': int, 'b': float, 'c': float}, {}],
-                    [{'a': int, 'b': float, 'c': str}, {}]]
-        self.assertEqual(result, expected)'''
-
     def test_convert_to_sig_list(self):
         T = TypeVar('T', int, str)
         S = TypeVar('S', float, str)
@@ -133,7 +131,8 @@ def test_get_internal_typevars(self):
                     {'a': str, 'b': Dict[str, bool]}]
 
         result = type_annotations.get_internal_typevars(signature)
-        self.assertEqual(result, expected)
+
+        self.assertTrue(check_equal(result, expected))
 
     def test_update_sig(self):
         T = TypeVar('T', int, str)
@@ -158,7 +157,8 @@ def test_expand_typevars(self):
                     {'a': str, 'b': Dict[str, bool], 'c': int}]
 
         result = type_annotations.expand_typevars(sig, unique_typevars)
-        self.assertEqual(result, expected)
+
+        self.assertTrue(check_equal(result, expected))
 
     def test_product_annotations(self):
 
@@ -176,12 +176,10 @@ def test_product_annotations(self):
                     [{'a': int, 'b': Dict[int, bool], 'c': bool, 'd': int}, {'d': 3}],
                     [{'a': str, 'b': Dict[str, float], 'c': bool, 'd': int}, {'d': 3}],
                     [{'a': str, 'b': Dict[str, bool], 'c': bool, 'd': int}, {'d': 3}]]
-        
 
         result = type_annotations.product_annotations(annotations)
-        #print(result)
-        
-        self.assertEqual(result, expected)
+
+        self.assertTrue(check_equal(result, expected))
 
 
 if __name__ == '__main__':

numba_typing/type_annotations.py

@@ -1,5 +1,5 @@
 from inspect import signature
-from typing import get_type_hints, Union, TypeVar,_GenericAlias
+from typing import get_type_hints, Union, TypeVar, _GenericAlias
 from itertools import product
 from copy import deepcopy
 
@@ -43,15 +43,16 @@ def get_annotation_types(annotation):
 def product_annotations(annotations):
     '''Get all variants of annotations.'''
     types, vals = annotations
-    list_of_sig = convert_to_sig_list(types) 
+    list_of_sig = convert_to_sig_list(types)
     signature = []
     #unique_typevars = get_internal_typevars(list_of_sig)
 
     for sig in list_of_sig:
         signature.extend(get_internal_typevars(sig))
-    
+
     return add_vals_to_signature(signature, vals)
 
+
 def add_vals_to_signature(signature, vals):
     '''Add default values ​​to all signatures'''
     result = []