From 7b27cf74e38c8020e0f3a7b29004cfd64807d8e9 Mon Sep 17 00:00:00 2001 From: Eduardo Ponz Segrelles Date: Wed, 12 Jun 2024 10:25:32 +0200 Subject: [PATCH] Adjust for API changes in RTPS reader APIs (#140) * Refs #21120: Adjust for API changes Signed-off-by: eduponz * Refs #21120: Correct typo Signed-off-by: eduponz * Refs #21120. Force fastdds log consumer to `STDOUT`. Signed-off-by: Miguel Company --------- Signed-off-by: eduponz Signed-off-by: Miguel Company Co-authored-by: Miguel Company --- .github/workflows/test.meta | 25 ++++++------------- .../test/api/test_domainparticipant.py | 4 +-- .../test/api/test_domainparticipantfactory.py | 4 +-- fastdds_python/test/api/test_publisher.py | 2 +- fastdds_python/test/api/test_qos.py | 24 +++++++++--------- fastdds_python/test/api/test_subscriber.py | 2 +- 6 files changed, 26 insertions(+), 35 deletions(-) diff --git a/.github/workflows/test.meta b/.github/workflows/test.meta index a163fc87..e9fa04dd 100644 --- a/.github/workflows/test.meta +++ b/.github/workflows/test.meta @@ -1,17 +1,8 @@ -{ - "names": - { - "fastdds": - { - "cmake-args": [ - "-DSECURITY=ON" - ] - }, - "fastdds_python": - { - "cmake-args": [ - "-DBUILD_TESTING=ON" - ] - } - } -} +names: + fastdds: + cmake-args: + - "-DSECURITY=ON" + - "-DLOG_CONSUMER_DEFAULT=STDOUT" + fastdds_python: + cmake-args: + - "-DBUILD_TESTING=ON" diff --git a/fastdds_python/test/api/test_domainparticipant.py b/fastdds_python/test/api/test_domainparticipant.py index f0084c2d..8532974c 100644 --- a/fastdds_python/test/api/test_domainparticipant.py +++ b/fastdds_python/test/api/test_domainparticipant.py @@ -202,7 +202,7 @@ def test_create_publisher_with_profile(participant): # Failure publisher = participant.create_publisher_with_profile( - 'no_exits_profile') + 'no_exists_profile') assert(publisher is None) # Overload 1 @@ -436,7 +436,7 @@ def test_create_subscriber_with_profile(participant): # Failure subscriber = participant.create_subscriber_with_profile( - 'no_exits_profile') + 'no_exists_profile') assert(subscriber is None) # Overload 1 diff --git a/fastdds_python/test/api/test_domainparticipantfactory.py b/fastdds_python/test/api/test_domainparticipantfactory.py index 501fdbed..4a9bc0fc 100644 --- a/fastdds_python/test/api/test_domainparticipantfactory.py +++ b/fastdds_python/test/api/test_domainparticipantfactory.py @@ -125,10 +125,10 @@ def test_create_participant_with_profile(): # Failure participant = factory.create_participant_with_profile( - 'no_exits_profile') + 'no_exists_profile') assert(participant is None) participant = factory.create_participant_with_profile( - 0, 'no_exits_profile') + 0, 'no_exists_profile') assert(participant is None) # Overload 1 diff --git a/fastdds_python/test/api/test_publisher.py b/fastdds_python/test/api/test_publisher.py index 39ddc0e0..032de12d 100644 --- a/fastdds_python/test/api/test_publisher.py +++ b/fastdds_python/test/api/test_publisher.py @@ -219,7 +219,7 @@ def test_create_datawriter_with_profile(topic, publisher): # Failure datawriter = publisher.create_datawriter_with_profile( - topic, 'no_exits_profile') + topic, 'no_exists_profile') assert(datawriter is None) # Overload 1 diff --git a/fastdds_python/test/api/test_qos.py b/fastdds_python/test/api/test_qos.py index 8a80e0f5..6efcb47e 100644 --- a/fastdds_python/test/api/test_qos.py +++ b/fastdds_python/test/api/test_qos.py @@ -153,11 +153,11 @@ def test_datareader_qos(): datareader_qos.durability_service().service_cleanup_delay.nanosec) # .reliable_reader_qos - datareader_qos.reliable_reader_qos().times.initialAcknackDelay.seconds = 34 - datareader_qos.reliable_reader_qos().times.initialAcknackDelay.nanosec = 32 - datareader_qos.reliable_reader_qos().times.heartbeatResponseDelay. \ + datareader_qos.reliable_reader_qos().times.initial_acknack_delay.seconds = 34 + datareader_qos.reliable_reader_qos().times.initial_acknack_delay.nanosec = 32 + datareader_qos.reliable_reader_qos().times.heartbeat_response_delay. \ seconds = 432 - datareader_qos.reliable_reader_qos().times.heartbeatResponseDelay. \ + datareader_qos.reliable_reader_qos().times.heartbeat_response_delay. \ nanosec = 43 datareader_qos.reliable_reader_qos().disable_positive_ACKs.enabled = True datareader_qos.reliable_reader_qos().disable_positive_ACKs.duration. \ @@ -165,13 +165,13 @@ def test_datareader_qos(): datareader_qos.reliable_reader_qos().disable_positive_ACKs.duration. \ nanosec = 320 assert(34 == datareader_qos.reliable_reader_qos().times. - initialAcknackDelay.seconds) + initial_acknack_delay.seconds) assert(32 == datareader_qos.reliable_reader_qos().times. - initialAcknackDelay.nanosec) + initial_acknack_delay.nanosec) assert(432 == datareader_qos.reliable_reader_qos().times. - heartbeatResponseDelay.seconds) + heartbeat_response_delay.seconds) assert(43 == datareader_qos.reliable_reader_qos().times. - heartbeatResponseDelay.nanosec) + heartbeat_response_delay.nanosec) assert(datareader_qos.reliable_reader_qos(). disable_positive_ACKs.enabled) assert(13 == datareader_qos.reliable_reader_qos(). @@ -389,13 +389,13 @@ def test_datareader_qos(): # .reliable_reader_qos assert(34 == default_datareader_qos.reliable_reader_qos().times. - initialAcknackDelay.seconds) + initial_acknack_delay.seconds) assert(32 == default_datareader_qos.reliable_reader_qos().times. - initialAcknackDelay.nanosec) + initial_acknack_delay.nanosec) assert(432 == default_datareader_qos.reliable_reader_qos().times. - heartbeatResponseDelay.seconds) + heartbeat_response_delay.seconds) assert(43 == default_datareader_qos.reliable_reader_qos().times. - heartbeatResponseDelay.nanosec) + heartbeat_response_delay.nanosec) assert(default_datareader_qos.reliable_reader_qos(). disable_positive_ACKs.enabled) assert(13 == default_datareader_qos.reliable_reader_qos(). diff --git a/fastdds_python/test/api/test_subscriber.py b/fastdds_python/test/api/test_subscriber.py index 7155acb9..b8f443a0 100644 --- a/fastdds_python/test/api/test_subscriber.py +++ b/fastdds_python/test/api/test_subscriber.py @@ -222,7 +222,7 @@ def test_create_datareader_with_profile(topic, subscriber): # Failure datareader = subscriber.create_datareader_with_profile( - topic, 'no_exits_profile') + topic, 'no_exists_profile') assert(datareader is None) # Overload 1