ci: move keyword escaping check to pytest

Signed-off-by: Esteve Fernandez <esteve@apache.org>

Author: esteve

.github/workflows/ci.yaml

@@ -28,11 +28,11 @@ jobs:
 
       - name: Check Python syntax
         run: |
-          python -m compileall -q rosidl_generator_rs/rosidl_generator_rs
+          python -m compileall -q rosidl_generator_rs/rosidl_generator_rs rosidl_generator_rs/test
           python -m py_compile rosidl_generator_rs/bin/rosidl_generator_rs
 
       - name: Lint Python sources
-        run: python -m ruff check rosidl_generator_rs/rosidl_generator_rs rosidl_generator_rs/bin/rosidl_generator_rs
+        run: python -m ruff check rosidl_generator_rs/rosidl_generator_rs rosidl_generator_rs/bin/rosidl_generator_rs rosidl_generator_rs/test
 
   ros:
     name: ROS build and test (${{ matrix.ros_distro }})
@@ -83,20 +83,6 @@ jobs:
           source /opt/ros/${{ matrix.ros_distro }}/setup.bash
           colcon build --packages-up-to rosidl_generator_rs_tests --event-handlers console_direct+
 
-      - name: Check Rust keyword escaping
-        shell: bash
-        run: |
-          source /opt/ros/${{ matrix.ros_distro }}/setup.bash
-          source install/setup.bash
-          python3 - <<'PY'
-          from rosidl_generator_rs import get_rs_name
-
-          for keyword in ('try', 'type', 'const', 'async', 'match'):
-              assert get_rs_name(keyword) == f'{keyword}_'
-
-          assert get_rs_name('plain_field') == 'plain_field'
-          PY
-
       - name: Test package
         shell: bash
         run: |

rosidl_generator_rs/CMakeLists.txt

@@ -17,7 +17,13 @@ ament_index_register_resource("rosidl_generator_packages")
 ament_python_install_package(${PROJECT_NAME})
 
 if(BUILD_TESTING)
+  find_package(ament_cmake_pytest REQUIRED)
   find_package(ament_lint_auto REQUIRED)
+
+  ament_add_pytest_test(test_keyword_escaping test/test_keyword_escaping.py
+    APPEND_ENV PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}
+  )
+
   # The Python sources are checked by Ruff in CI. Copyright and docstring
   # linters are noisy for template files in this generator package.
   set(ament_cmake_copyright_FOUND TRUE)

rosidl_generator_rs/package.xml

@@ -28,6 +28,7 @@
   <exec_depend>rosidl_parser</exec_depend>
 
   <test_depend>ament_cmake_gtest</test_depend>
+  <test_depend>ament_cmake_pytest</test_depend>
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>
   <test_depend condition="humble >= $ROS_DISTRO">rosidl_cmake</test_depend>

rosidl_generator_rs/test/test_keyword_escaping.py

@@ -0,0 +1,10 @@
+from rosidl_generator_rs import get_rs_name
+
+
+def test_rust_keywords_are_escaped():
+    for keyword in ("try", "type", "const", "async", "match"):
+        assert get_rs_name(keyword) == f"{keyword}_"
+
+
+def test_non_keyword_names_are_unchanged():
+    assert get_rs_name("plain_field") == "plain_field"