Consistent exception naming

Author: brunorijsman

common/exceptions.py

@@ -314,7 +314,7 @@ def __init__(self):
         )
 
 
-class InvalidEncodedFragment(DSKEException):
+class InvalidEncodedFragmentError(DSKEException):
     """
     Exception raised when trying to parse an encoded fragment string that is invalid.
     """
@@ -327,7 +327,7 @@ def __init__(self, encoded_fragment: str):
         )
 
 
-class InvalidEncodedSignature(DSKEException):
+class InvalidEncodedSignatureError(DSKEException):
     """
     Exception raised when trying to parse an encoded signature string that is invalid.
     """

common/fragment.py

@@ -4,7 +4,7 @@
 
 from uuid import UUID
 import pydantic
-from common.exceptions import InvalidBlockUUIDError, InvalidEncodedFragment
+from common.exceptions import InvalidBlockUUIDError, InvalidEncodedFragmentError
 from . import utils
 
 
@@ -135,7 +135,7 @@ def from_enc_str(
         """
         parts = enc_str.split(":")
         if len(parts) != 3:
-            raise InvalidEncodedFragment(encoded_fragment=enc_str)
+            raise InvalidEncodedFragmentError(encoded_fragment=enc_str)
         block_uuid_str, start_byte_str, size_str = parts
         try:
             block_uuid = UUID(block_uuid_str)
@@ -145,10 +145,10 @@ def from_enc_str(
         try:
             start = int(start_byte_str)
         except ValueError as exc:
-            raise InvalidEncodedFragment(encoded_fragment=enc_str) from exc
+            raise InvalidEncodedFragmentError(encoded_fragment=enc_str) from exc
         try:
             size = int(size_str)
         except ValueError as exc:
-            raise InvalidEncodedFragment(encoded_fragment=enc_str) from exc
+            raise InvalidEncodedFragmentError(encoded_fragment=enc_str) from exc
         data = block.take_data(start, size)
         return Fragment(block=block, start=start, size=size, data=data)

common/tests/test_allocation.py

@@ -6,7 +6,7 @@
 from common.allocation import Allocation, APIAllocation
 from common.exceptions import (
     InvalidBlockUUIDError,
-    InvalidEncodedFragment,
+    InvalidEncodedFragmentError,
     InvalidPSRDIndex,
 )
 from common.fragment import APIFragment, Fragment
@@ -194,7 +194,7 @@ def test_from_enc_str_bad_no_fragments():
     Attempt to create an Allocation from a bad encoded string (no fragments).
     """
     pool, _blocks = create_test_pool_and_blocks([10])
-    with pytest.raises(InvalidEncodedFragment):
+    with pytest.raises(InvalidEncodedFragmentError):
         _allocation = Allocation.from_enc_str("", pool)
 
 

common/tests/test_fragment.py

@@ -4,7 +4,7 @@
 
 from uuid import uuid4
 import pytest
-from common.exceptions import InvalidBlockUUIDError, InvalidEncodedFragment
+from common.exceptions import InvalidBlockUUIDError, InvalidEncodedFragmentError
 from common.fragment import APIFragment, Fragment
 from common.utils import bytes_to_str
 from .unit_test_common import create_test_block, create_test_pool_and_blocks
@@ -151,16 +151,16 @@ def test_from_enc_str_bad_str():
     # pylint: disable=protected-access
     (pool, blocks) = create_test_pool_and_blocks([10])
     # No colons
-    with pytest.raises(InvalidEncodedFragment):
+    with pytest.raises(InvalidEncodedFragmentError):
         _fragment = Fragment.from_enc_str("not-an-encoded-str", pool)
     # Only one colon
-    with pytest.raises(InvalidEncodedFragment):
+    with pytest.raises(InvalidEncodedFragmentError):
         _fragment = Fragment.from_enc_str(f"{blocks[0].uuid}:only-one-colon", pool)
     # Start is not a number
-    with pytest.raises(InvalidEncodedFragment):
+    with pytest.raises(InvalidEncodedFragmentError):
         _fragment = Fragment.from_enc_str(f"{blocks[0].uuid}:not-a-number:5", pool)
     # Size is not a number
-    with pytest.raises(InvalidEncodedFragment):
+    with pytest.raises(InvalidEncodedFragmentError):
         _fragment = Fragment.from_enc_str(f"{blocks[0].uuid}:0:not-a-number", pool)