unit test fixes. composite metadata helper refactoring.

Author: jell-o-fishi

rsocket/extensions/composite_metadata.py

@@ -48,7 +48,7 @@ def extend(self, *items: CompositeMetadataItem) -> 'CompositeMetadata':
         self.items.extend(items)
         return self
 
-    def parse(self, metadata: bytes):
+    def parse(self, metadata: bytes) -> 'CompositeMetadata':
         composite_length = len(metadata)
         offset = 0
 
@@ -70,6 +70,8 @@ def parse(self, metadata: bytes):
             self.append(item)
             offset += metadata_length
 
+        return self
+
     def serialize(self) -> bytes:
         serialized = b''
 

rsocket/reactivex/reactivex_handler.py

@@ -60,9 +60,7 @@ async def on_close(self, rsocket, exception: Optional[Exception] = None):
 
     # noinspection PyMethodMayBeStatic
     def _parse_composite_metadata(self, metadata: bytes) -> CompositeMetadata:
-        composite_metadata = CompositeMetadata()
-        composite_metadata.parse(metadata)
-        return composite_metadata
+        return CompositeMetadata().parse(metadata)
 
 
 class BaseReactivexHandler(ReactivexHandler):

tests/rx_support/test_rx_handler.py

@@ -14,4 +14,4 @@ async def test_rx_handler():
         await handler.request_response(Payload())
 
     with pytest.raises(Exception):
-        await handler.request_channel(Payload())
+        await handler.request_stream(Payload())

tests/test_reactivex/test_reactivex_handler.py

@@ -14,4 +14,4 @@ async def test_reactivex_handler():
         await handler.request_response(Payload())
 
     with pytest.raises(Exception):
-        await handler.request_channel(Payload())
+        await handler.request_stream(Payload())