From 3186e15b83fda833e37f5b7a77b16ff5e82d74b9 Mon Sep 17 00:00:00 2001
From: Andrea Sorbini <asorbini@rti.com>
Date: Fri, 9 Apr 2021 13:13:24 -0700
Subject: [PATCH] Restore exceptions for Connext and message timestamps on
 Windows (#765)

Signed-off-by: Andrea Sorbini <asorbini@rti.com>
---
 rclpy/test/test_client.py | 5 +++++
 rclpy/test/test_node.py   | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/rclpy/test/test_client.py b/rclpy/test/test_client.py
index f393e141e..7659d6a3e 100644
--- a/rclpy/test/test_client.py
+++ b/rclpy/test/test_client.py
@@ -12,12 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import platform
 import time
 import unittest
 
 from rcl_interfaces.srv import GetParameters
 import rclpy
 import rclpy.executors
+from rclpy.utilities import get_rmw_implementation_identifier
 
 # TODO(sloretz) Reduce fudge once wait_for_service uses node graph events
 TIME_FUDGE = 0.3
@@ -89,6 +91,9 @@ def test_concurrent_calls_to_service(self):
             self.node.destroy_client(cli)
             self.node.destroy_service(srv)
 
+    @unittest.skipIf(
+        get_rmw_implementation_identifier() == 'rmw_connextdds' and platform.system() == 'Windows',
+        reason='Source timestamp not implemented for Connext on Windows')
     def test_service_timestamps(self):
         cli = self.node.create_client(GetParameters, 'get/parameters')
         srv = self.node.create_service(
diff --git a/rclpy/test/test_node.py b/rclpy/test/test_node.py
index 9f94ce323..ada7f196d 100644
--- a/rclpy/test/test_node.py
+++ b/rclpy/test/test_node.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import pathlib
+import platform
 import time
 import unittest
 from unittest.mock import Mock
@@ -49,6 +50,7 @@
 from rclpy.qos import QoSProfile
 from rclpy.qos import QoSReliabilityPolicy
 from rclpy.time_source import USE_SIM_TIME_NAME
+from rclpy.utilities import get_rmw_implementation_identifier
 from test_msgs.msg import BasicTypes
 
 TEST_NODE = 'my_node'
@@ -144,6 +146,9 @@ def test_create_raw_subscription(self):
     def dummy_cb(self, msg):
         pass
 
+    @unittest.skipIf(
+        get_rmw_implementation_identifier() == 'rmw_connextdds' and platform.system() == 'Windows',
+        reason='Source timestamp not implemented for Connext on Windows')
     def test_take(self):
         basic_types_pub = self.node.create_publisher(BasicTypes, 'take_test', 1)
         sub = self.node.create_subscription(