bt2: Adapt test_graph.py and make it pass

[babeltrace.git] / bindings / python / bt2 / bt2 / message.py

diff --git a/bindings/python/bt2/bt2/message.py b/bindings/python/bt2/bt2/message.py
index 0baf1a71e74d65dec677b7d3752eb133999074d4..6a48f93adde51231f3a957f4f2263eb4b822a1c5 100644 (file)
--- a/bindings/python/bt2/bt2/message.py
+++ b/bindings/python/bt2/bt2/message.py
@@ -145,18 +145,9 @@ class _PacketBeginningMessage(_CopyableMessage):
         return PacketBeginningMessage(self.packet)
 
 
         return PacketBeginningMessage(self.packet)
 
 

-class PacketEndMessage(_CopyableMessage):
+class _PacketEndMessage(_CopyableMessage):

     _TYPE = native_bt.MESSAGE_TYPE_PACKET_END
 
     _TYPE = native_bt.MESSAGE_TYPE_PACKET_END
 

-    def __init__(self, packet):
-        utils._check_type(packet, bt2.packet._Packet)
-        ptr = native_bt.message_packet_end_create(packet._ptr)
-
-        if ptr is None:
-            raise bt2.CreationError('cannot create packet end message object')
-
-        super().__init__(ptr)
-

     @property
     def packet(self):
         packet_ptr = native_bt.message_packet_end_get_packet(self._ptr)
     @property
     def packet(self):
         packet_ptr = native_bt.message_packet_end_get_packet(self._ptr)


@@ -206,18 +197,9 @@ class _StreamBeginningMessage(_CopyableMessage):
         return StreamBeginningMessage(self.stream)
 
 
         return StreamBeginningMessage(self.stream)
 
 

-class StreamEndMessage(_CopyableMessage):
+class _StreamEndMessage(_CopyableMessage):

     _TYPE = native_bt.MESSAGE_TYPE_STREAM_END
 
     _TYPE = native_bt.MESSAGE_TYPE_STREAM_END
 

-    def __init__(self, stream):
-        utils._check_type(stream, bt2.stream._Stream)
-        ptr = native_bt.message_stream_end_create(stream._ptr)
-
-        if ptr is None:
-            raise bt2.CreationError('cannot create stream end message object')
-
-        super().__init__(ptr)
-

     @property
     def stream(self):
         stream_ptr = native_bt.message_stream_end_get_stream(self._ptr)
     @property
     def stream(self):
         stream_ptr = native_bt.message_stream_end_get_stream(self._ptr)


@@ -473,9 +455,9 @@ class _DiscardedEventsMessage(_DiscardedElementsMessage):
 _MESSAGE_TYPE_TO_CLS = {
     native_bt.MESSAGE_TYPE_EVENT: _EventMessage,
     native_bt.MESSAGE_TYPE_PACKET_BEGINNING: _PacketBeginningMessage,
 _MESSAGE_TYPE_TO_CLS = {
     native_bt.MESSAGE_TYPE_EVENT: _EventMessage,
     native_bt.MESSAGE_TYPE_PACKET_BEGINNING: _PacketBeginningMessage,

-    native_bt.MESSAGE_TYPE_PACKET_END: PacketEndMessage,
+    native_bt.MESSAGE_TYPE_PACKET_END: _PacketEndMessage,

     native_bt.MESSAGE_TYPE_STREAM_BEGINNING: _StreamBeginningMessage,
     native_bt.MESSAGE_TYPE_STREAM_BEGINNING: _StreamBeginningMessage,

-    native_bt.MESSAGE_TYPE_STREAM_END: StreamEndMessage,
+    native_bt.MESSAGE_TYPE_STREAM_END: _StreamEndMessage,

     native_bt.MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY: InactivityMessage,
     native_bt.MESSAGE_TYPE_DISCARDED_PACKETS: _DiscardedPacketsMessage,
     native_bt.MESSAGE_TYPE_DISCARDED_EVENTS: _DiscardedEventsMessage,
     native_bt.MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY: InactivityMessage,
     native_bt.MESSAGE_TYPE_DISCARDED_PACKETS: _DiscardedPacketsMessage,
     native_bt.MESSAGE_TYPE_DISCARDED_EVENTS: _DiscardedEventsMessage,