From 1866ab143c17ed128b09e9124154248715531636 Mon Sep 17 00:00:00 2001 From: Christian Henkel Date: Mon, 31 Jul 2023 16:58:05 +0200 Subject: [PATCH 1/2] not testing on foxy any more Signed-off-by: Christian Henkel --- .github/workflows/test.yaml | 6 ++---- README.md | 3 +-- .../test/systemtest/test_ntp_monitor.py | 6 ++++++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index dcd065e67..9b6860be2 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -21,11 +21,9 @@ jobs: diagnostic_updater, self_test, ] - distro: [foxy, humble, rolling] - # distro: [foxy, humble, iron, rolling] + distro: [humble, rolling] + # distro: [humble, iron, rolling] include: - - distro: foxy - os: ubuntu-20.04 - distro: humble os: ubuntu-22.04 # - distro: iron diff --git a/README.md b/README.md index 7d9b19555..521414bf7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Test diagnostics](https://img.shields.io/github/actions/workflow/status/ros/diagnostics/test.yaml?label=test&style=flat-square)](https://github.com/ros/diagnostics/actions/workflows/test.yaml) [![Lint diagnostics](https://img.shields.io/github/actions/workflow/status/ros/diagnostics/lint.yaml?label=lint&style=flat-square)](https://github.com/ros/diagnostics/actions/workflows/lint.yaml) [![ROS2 Foxy](https://img.shields.io/ros/v/foxy/diagnostics.svg?style=flat-square)](https://index.ros.org/r/diagnostics/#foxy) [![ROS2 Humble](https://img.shields.io/ros/v/humble/diagnostics.svg?style=flat-square)](https://index.ros.org/r/diagnostics/#humble) [![ROS2 Iron](https://img.shields.io/ros/v/iron/diagnostics.svg?style=flat-square)](https://index.ros.org/r/diagnostics/#iron) [![ROS2 Rolling](https://img.shields.io/ros/v/rolling/diagnostics.svg?style=flat-square)](https://index.ros.org/r/diagnostics/#rolling) +[![Test diagnostics](https://img.shields.io/github/actions/workflow/status/ros/diagnostics/test.yaml?label=test&style=flat-square)](https://github.com/ros/diagnostics/actions/workflows/test.yaml) [![Lint diagnostics](https://img.shields.io/github/actions/workflow/status/ros/diagnostics/lint.yaml?label=lint&style=flat-square)](https://github.com/ros/diagnostics/actions/workflows/lint.yaml) [![ROS2 Humble](https://img.shields.io/ros/v/humble/diagnostics.svg?style=flat-square)](https://index.ros.org/r/diagnostics/#humble) [![ROS2 Iron](https://img.shields.io/ros/v/iron/diagnostics.svg?style=flat-square)](https://index.ros.org/r/diagnostics/#iron) [![ROS2 Rolling](https://img.shields.io/ros/v/rolling/diagnostics.svg?style=flat-square)](https://index.ros.org/r/diagnostics/#rolling) # Overview @@ -36,7 +36,6 @@ Diagnostics messages that are not aggregated can be visualized by [`rqt_runtime_ The [`ros2` branch](https://github.com/ros/diagnostics/tree/ros2) targets -- *Foxy Fitzroy*, - *Humble Hawksbill* - *Iron Irwini* and - *Rolling Ridley* diff --git a/diagnostic_common_diagnostics/test/systemtest/test_ntp_monitor.py b/diagnostic_common_diagnostics/test/systemtest/test_ntp_monitor.py index 0bb569ca8..4966cc2d8 100644 --- a/diagnostic_common_diagnostics/test/systemtest/test_ntp_monitor.py +++ b/diagnostic_common_diagnostics/test/systemtest/test_ntp_monitor.py @@ -102,6 +102,12 @@ def _count_msgs(self, timeout_s): return self.n_msgs_received def test_publishing(self): + self.assertEqual( + self.subprocess.poll(), + None, + 'NTP monitor subprocess died' + ) + n = self._count_msgs(TIMEOUT_MAX_S) self.assertGreater( From 42d733734272919246ecabfed4297e8384071dc0 Mon Sep 17 00:00:00 2001 From: Christian Henkel Date: Mon, 31 Jul 2023 16:59:30 +0200 Subject: [PATCH 2/2] adding iron Signed-off-by: Christian Henkel --- .github/workflows/test.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 9b6860be2..2fe97d371 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -21,13 +21,12 @@ jobs: diagnostic_updater, self_test, ] - distro: [humble, rolling] - # distro: [humble, iron, rolling] + distro: [humble, iron, rolling] include: - distro: humble os: ubuntu-22.04 - # - distro: iron - # os: ubuntu-22.04 + - distro: iron + os: ubuntu-22.04 - distro: rolling os: ubuntu-22.04 runs-on: ${{ matrix.os }}