Merge branch 'main' into 835_transmission_bug

DiamondLightSource · Aug 1, 2023 · c16690d · c16690d
2 parents 3c8c602 + e44ff14
commit c16690d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/artemis/external_interaction/unit_tests/test_store_in_ispyb.py b/src/artemis/external_interaction/unit_tests/test_store_in_ispyb.py
@@ -149,7 +149,7 @@ def dummy_ispyb_3d(dummy_params):
 def test_get_current_time_string(dummy_ispyb):
     current_time = dummy_ispyb.get_current_time_string()
 
-    assert type(current_time) == str
+    assert isinstance(current_time, str)
     assert re.match(TIME_FORMAT_REGEX, current_time) is not None
 
 

diff --git a/src/artemis/external_interaction/unit_tests/test_zocalo_interaction.py b/src/artemis/external_interaction/unit_tests/test_zocalo_interaction.py
@@ -138,7 +138,7 @@ def test_when_message_recieved_from_zocalo_then_point_returned(
 
         return_value = future.result()
 
-    assert type(return_value) == list
+    assert isinstance(return_value, list)
     returned_com = np.array([*return_value[0]["centre_of_mass"]])
     np.testing.assert_array_almost_equal(
         returned_com, np.array([*centre_of_mass_coords])