Allow None as option for ChoiceMeta

dls-controls · Jul 13, 2016 · d9f9bb7 · d9f9bb7
1 parent d80f6f4
commit d9f9bb7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/malcolm/core/choicemeta.py b/malcolm/core/choicemeta.py
@@ -36,7 +36,7 @@ def validate(self, value):
             ValueError: If value not valid
         """
 
-        if value in self.choices:
+        if value is None or value in self.choices:
             return value
         else:
             raise ValueError("%s is not a valid value" % value)

diff --git a/tests/test_core/test_choicemeta.py b/tests/test_core/test_choicemeta.py
@@ -36,6 +36,10 @@ def test_given_valid_value_then_return(self):
         response = self.choice_meta.validate(1)
         self.assertEqual(1, response)
 
+    def test_None_valid(self):
+        response = self.choice_meta.validate(None)
+        self.assertEqual(None, response)
+
     def test_given_invalid_value_then_raises(self):
         with self.assertRaises(ValueError):
             self.choice_meta.validate(0)