typeconverter: EnumConverter: Do not convert none

mkorpela · mkorpela · commit 08c6ae83de01 · 2020-10-05T14:33:03.000+03:00
diff --git a/atest/testdata/keywords/type_conversion/Annotations.py b/atest/testdata/keywords/type_conversion/Annotations.py
@@ -14,6 +14,10 @@ class MyEnum(Enum):
     foo = 'yyy'
     normalize_me = True
 
+class NoneEnum(Enum):
+    NONE = 1
+    NTWO = 2
+    NTHREE = 3
 
 class Unknown(object):
     pass
@@ -75,6 +79,10 @@ def enum_(argument: MyEnum, expected=None):
     _validate_type(argument, expected)
 
 
+def none_enum_(argument: NoneEnum, expected=None):
+    _validate_type(argument, expected)
+
+
 def nonetype(argument: type(None), expected=None):
     _validate_type(argument, expected)
 
diff --git a/atest/testdata/keywords/type_conversion/annotations.robot b/atest/testdata/keywords/type_conversion/annotations.robot
@@ -167,6 +167,9 @@ Enum
     Enum                 FOO                       MyEnum.FOO
     Enum                 bar                       MyEnum.bar
     Enum                 foo                       MyEnum.foo
+    None enum            NTWO                      NoneEnum.NTWO
+    None enum            None                      NoneEnum.NONE
+    None enum            NONE                      NoneEnum.NONE
 
 Normalized enum member match
     Enum                 b a r                     MyEnum.bar
@@ -184,6 +187,7 @@ Invalid Enum
     [Template]           Conversion Should Fail
     Enum                 foobar                    type=MyEnum           error=MyEnum does not have member 'foobar'. Available: 'FOO', 'bar', 'foo' and 'normalize_me'
     Enum                 bar!                      type=MyEnum           error=MyEnum does not have member 'bar!'. Available: 'FOO', 'bar', 'foo' and 'normalize_me'
+    Enum                 None                      type=MyEnum           error=MyEnum does not have member 'None'. Available: 'FOO', 'bar', 'foo' and 'normalize_me'
 
 NoneType
     NoneType             None                      None
@@ -390,7 +394,6 @@ String None is converted to None object
     Dictionary
     Set
     Frozenset
-    Enum
     DateTime
     Date
     Timedelta
diff --git a/src/robot/running/arguments/typeconverters.py b/src/robot/running/arguments/typeconverters.py
@@ -244,6 +244,7 @@ def _convert(self, value, explicit_type=True):
 @TypeConverter.register
 class EnumConverter(TypeConverter):
     type = Enum
+    convert_none = False
 
     def __init__(self, enum=None):
         self._enum = enum
