Replace conditional `self.fail()` method calls with asserts

test/unit/app/managers/base.py

@@ -58,17 +58,14 @@ class BaseTestCase(unittest.TestCase):
 
     def assertHasKeys(self, obj, key_list):
         for key in key_list:
-            if key not in obj:
-                self.fail("Missing key: " + key)
+            assert key in obj
 
     def assertNullableBasestring(self, item):
-        if not isinstance(item, (str, type(None))):
-            self.fail("Non-nullable basestring: " + str(type(item)))
+        assert isinstance(item, (str, type(None)))
         # TODO: len mod 8 and hex re
 
     def assertEncodedId(self, item):
-        if not isinstance(item, str):
-            self.fail("Non-string: " + str(type(item)))
+        assert isinstance(item, str)
         # TODO: len mod 8 and hex re
 
     def assertNullableEncodedId(self, item):
@@ -76,29 +73,25 @@ class BaseTestCase(unittest.TestCase):
             self.assertEncodedId(item)
 
     def assertDate(self, item):
-        if not isinstance(item, str):
-            self.fail("Non-string: " + str(type(item)))
+        assert isinstance(item, str)
         # TODO: no great way to parse this fully (w/o python-dateutil)
         # TODO: re?
 
     def assertUUID(self, item):
-        if not isinstance(item, str):
-            self.fail("Non-string: " + str(type(item)))
+        assert isinstance(item, str)
         # TODO: re for d4d76d69-80d4-4ed7-80c7-211ebcc1a358
 
     def assertORMFilter(self, item):
-        if not isinstance(
+        assert isinstance(
             item.filter, (sqlalchemy.sql.elements.BinaryExpression, sqlalchemy.sql.elements.BooleanClauseList)
-        ):
-            self.fail("Not an orm filter: " + str(type(item.filter)))
+        ), "Not an orm filter"
 
     def assertORMFunctionFilter(self, item):
         assert item.filter_type == "orm_function"
         assert callable(item.filter)
 
     def assertFnFilter(self, item):
-        if not item.filter or not callable(item.filter):
-            self.fail("Not a fn filter: " + str(type(item.filter)))
+        assert item.filter and callable(item.filter), "Not a fn filter"
 
     def assertIsJsonifyable(self, item):
         # TODO: use galaxy's override

test/unit/app/managers/test_DatasetManager.py

@@ -226,11 +226,9 @@ class DatasetSerializerTestCase(BaseTestCase):
         self.log("should have a serializer for all serializable keys")
         for key in self.dataset_serializer.serializable_keyset:
             instantiated_attribute = getattr(dataset, key, None)
-            if not (
-                (key in self.dataset_serializer.serializers)
-                or (isinstance(instantiated_attribute, self.TYPES_NEEDING_NO_SERIALIZERS))
-            ):
-                self.fail(f"no serializer for: {key} ({instantiated_attribute})")
+            assert key in self.dataset_serializer.serializers or isinstance(
+                instantiated_attribute, self.TYPES_NEEDING_NO_SERIALIZERS
+            ), f"No serializer for: {key} ({instantiated_attribute})"
 
     def test_views_and_keys(self):
         dataset = self.dataset_manager.create()

test/unit/app/managers/test_HDAManager.py

@@ -400,12 +400,11 @@ class HDASerializerTestCase(HDATestCase):
         self.log("should have a serializer for all serializable keys")
         for key in self.hda_serializer.serializable_keyset:
             instantiated_attribute = getattr(hda, key, None)
-            if not (
-                (key in self.hda_serializer.serializers)
-                or (isinstance(instantiated_attribute, self.TYPES_NEEDING_NO_SERIALIZERS))
-                or (is_metadata(key))
-            ):
-                self.fail(f"no serializer for: {key} ({instantiated_attribute})")
+            assert (
+                key in self.hda_serializer.serializers
+                or isinstance(instantiated_attribute, self.TYPES_NEEDING_NO_SERIALIZERS)
+                or is_metadata(key)
+            ), f"No serializer for: {key} ({instantiated_attribute})"
 
     def test_views_and_keys(self):
         hda = self._create_vanilla_hda()

test/unit/app/managers/test_HDCAManager.py

@@ -82,11 +82,9 @@ class HDCASerializerTestCase(HDCATestCase):
         self.log("should have a serializer for all serializable keys")
         for key in serializer.serializable_keyset:
             instantiated_attribute = getattr(item, key, None)
-            if not (
-                (key in serializer.serializers)
-                or (isinstance(instantiated_attribute, self.TYPES_NEEDING_NO_SERIALIZERS))
-            ):
-                self.fail(f"no serializer for: {key} ({instantiated_attribute})")
+            assert key in serializer.serializers or isinstance(
+                instantiated_attribute, self.TYPES_NEEDING_NO_SERIALIZERS
+            ), f"No serializer for: {key} ({instantiated_attribute})"
 
     def test_views_and_keys(self):
         serializer = self.hdca_serializer

test/unit/app/managers/test_HistoryManager.py

@@ -410,11 +410,9 @@ class HistorySerializerTestCase(BaseTestCase):
         self.log("should have a serializer for all serializable keys")
         for key in self.history_serializer.serializable_keyset:
             instantiated_attribute = getattr(history1, key, None)
-            if not (
-                (key in self.history_serializer.serializers)
-                or (isinstance(instantiated_attribute, self.TYPES_NEEDING_NO_SERIALIZERS))
-            ):
-                self.fail(f"no serializer for: {key} ({instantiated_attribute})")
+            assert key in self.history_serializer.serializers or isinstance(
+                instantiated_attribute, self.TYPES_NEEDING_NO_SERIALIZERS
+            ), f"No serializer for: {key} ({instantiated_attribute})"
 
     def test_views_and_keys(self):
         user2 = self.user_manager.create(**user2_data)

test/unit/app/managers/test_UserManager.py

@@ -237,11 +237,9 @@ class UserSerializerTestCase(BaseTestCase):
         self.log("should have a serializer for all serializable keys")
         for key in self.user_serializer.serializable_keyset:
             instantiated_attribute = getattr(user, key, None)
-            if not (
-                (key in self.user_serializer.serializers)
-                or (isinstance(instantiated_attribute, self.TYPES_NEEDING_NO_SERIALIZERS))
-            ):
-                self.fail(f"no serializer for: {key} ({instantiated_attribute})")
+            assert key in self.user_serializer.serializers or isinstance(
+                instantiated_attribute, self.TYPES_NEEDING_NO_SERIALIZERS
+            ), f"No serializer for: {key} ({instantiated_attribute})"
 
     def test_views_and_keys(self):
         user = self.user_manager.create(**user2_data)