Merge 8a56401 into 4737180

simonsobs · Aug 28, 2020 · 60efc08 · 60efc08
2 parents 4737180 + 8a56401
commit 60efc08
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/ocs/ocs_feed.py b/ocs/ocs_feed.py
@@ -239,7 +239,7 @@ def verify_message_data_type(value):
                 'data' dictionary value published (see Feed.publish_message for details).
 
         """
-        valid_types = (float, int)
+        valid_types = (float, int, str)
 
         # multi-sample check
         if isinstance(value, list):

diff --git a/tests/test_ocs_feed.py b/tests/test_ocs_feed.py
@@ -47,8 +47,7 @@ def test_valid_multi_sample_input(self):
         test_feed.publish_message(test_message)
 
     def test_str_single_sample_input(self):
-        """Passing a string, even just one, should cause an error upon
-        publishing.
+        """We should also now be able to pass strings.
 
         """
         mock_agent = MagicMock()
@@ -63,11 +62,10 @@ def test_str_single_sample_input(self):
             }
         }
 
-        with pytest.raises(TypeError):
-            test_feed.publish_message(test_message)
+        test_feed.publish_message(test_message)
 
     def test_str_multi_sample_input(self):
-        """Passing multiple points, including multiple invalid datatypes,
+        """Passing multiple points, including invalid datatypes,
         should cause a TypeError upon publishing.
 
         """