chore: abort bad merges

Author: allenporter

roborock/devices/traits/v1/common.py

@@ -38,7 +38,7 @@ class V1TraitMixin(ABC):
     command: ClassVar[RoborockCommand]
 
     @classmethod
-    def _parse_type_response(cls, response: V1ResponseData) -> Self:
+    def _parse_type_response(cls, response: V1ResponseData) -> RoborockBase:
         """Parse the response from the device into a a RoborockBase.
 
         Subclasses should override this method to implement custom parsing
@@ -53,7 +53,7 @@ def _parse_type_response(cls, response: V1ResponseData) -> Self:
             raise ValueError(f"Unexpected {cls} response format: {response!r}")
         return cls.from_dict(response)
 
-    def _parse_response(self, response: V1ResponseData) -> Self:
+    def _parse_response(self, response: V1ResponseData) -> RoborockBase:
         """Parse the response from the device into a a RoborockBase.
 
         This is used by subclasses that want to override the class

tests/protocols/test_v1_protocol.py

@@ -209,7 +209,7 @@ def test_create_map_response_decoder_invalid_endpoint(caplog: pytest.LogCaptureF
 
     decoder = create_map_response_decoder(SECURITY_DATA)
     assert decoder(message) is None
-    assert "Received map response not requested by this device, ignoring." in caplog.text
+    assert "Received map response requested not made by this device, ignoring." in caplog.text
 
 
 def test_create_map_response_decoder_invalid_payload():