From c7e5224bd55c9b9864f7e3a4e8d1a3df276ebc2b Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Fri, 6 Sep 2019 11:00:02 -0400 Subject: [PATCH] bt2: Add `Const` suffix to `_Connection` class and adapt tests Signed-off-by: Francis Deslauriers Change-Id: I9f695ece01ba48a1fc7008b0ff2ac036fc6e0a7f Reviewed-on: https://review.lttng.org/c/babeltrace/+/2007 Tested-by: jenkins Reviewed-by: Simon Marchi --- src/bindings/python/bt2/bt2/connection.py | 2 +- src/bindings/python/bt2/bt2/graph.py | 2 +- src/bindings/python/bt2/bt2/port.py | 4 ++-- tests/bindings/python/bt2/test_connection.py | 5 ++++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/bindings/python/bt2/bt2/connection.py b/src/bindings/python/bt2/bt2/connection.py index eb0c4316..cb69ef5a 100644 --- a/src/bindings/python/bt2/bt2/connection.py +++ b/src/bindings/python/bt2/bt2/connection.py @@ -25,7 +25,7 @@ from bt2 import port as bt2_port from bt2 import object as bt2_object -class _Connection(bt2_object._SharedObject): +class _ConnectionConst(bt2_object._SharedObject): _get_ref = staticmethod(native_bt.connection_get_ref) _put_ref = staticmethod(native_bt.connection_put_ref) diff --git a/src/bindings/python/bt2/bt2/graph.py b/src/bindings/python/bt2/bt2/graph.py index 6c9db7ec..14c3b65b 100644 --- a/src/bindings/python/bt2/bt2/graph.py +++ b/src/bindings/python/bt2/bt2/graph.py @@ -147,7 +147,7 @@ class Graph(object._SharedObject): ) utils._handle_func_status(status, 'cannot connect component ports within graph') assert conn_ptr - return bt2_connection._Connection._create_from_ptr(conn_ptr) + return bt2_connection._ConnectionConst._create_from_ptr(conn_ptr) def add_port_added_listener(self, listener): if not callable(listener): diff --git a/src/bindings/python/bt2/bt2/port.py b/src/bindings/python/bt2/bt2/port.py index 963a5b3c..d3bc398f 100644 --- a/src/bindings/python/bt2/bt2/port.py +++ b/src/bindings/python/bt2/bt2/port.py @@ -68,7 +68,7 @@ class _Port(object._SharedObject): if conn_ptr is None: return - return bt2_connection._Connection._create_from_ptr_and_get_ref(conn_ptr) + return bt2_connection._ConnectionConst._create_from_ptr_and_get_ref(conn_ptr) @property def is_connected(self): @@ -97,7 +97,7 @@ class _UserComponentPort(_Port): if conn_ptr is None: return - return bt2_connection._Connection._create_from_ptr_and_get_ref(conn_ptr) + return bt2_connection._ConnectionConst._create_from_ptr_and_get_ref(conn_ptr) @property def user_data(self): diff --git a/tests/bindings/python/bt2/test_connection.py b/tests/bindings/python/bt2/test_connection.py index 127fd2e8..edeefd08 100644 --- a/tests/bindings/python/bt2/test_connection.py +++ b/tests/bindings/python/bt2/test_connection.py @@ -18,6 +18,7 @@ import unittest import bt2 +from bt2 import connection as bt2_connection class ConnectionTestCase(unittest.TestCase): @@ -40,7 +41,8 @@ class ConnectionTestCase(unittest.TestCase): graph = bt2.Graph() src = graph.add_component(MySource, 'src') sink = graph.add_component(MySink, 'sink') - graph.connect_ports(src.output_ports['out'], sink.input_ports['in']) + conn = graph.connect_ports(src.output_ports['out'], sink.input_ports['in']) + self.assertIs(type(conn), bt2_connection._ConnectionConst) def test_downstream_port(self): class MyIter(bt2._UserMessageIterator): @@ -63,6 +65,7 @@ class ConnectionTestCase(unittest.TestCase): sink = graph.add_component(MySink, 'sink') conn = graph.connect_ports(src.output_ports['out'], sink.input_ports['in']) self.assertEqual(conn.downstream_port.addr, sink.input_ports['in'].addr) + self.assertIs(type(conn), bt2_connection._ConnectionConst) def test_upstream_port(self): class MyIter(bt2._UserMessageIterator): -- 2.34.1