Merge branch 'master' into async_hardware_components

ros-controls · Jul 17, 2024 · 4927ceb · 4927ceb
2 parents 7df569d + 1f8ca08
commit 4927ceb
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 56 deletions.
diff --git a/doc/migration/Jazzy.rst → doc/migration.rst b/doc/migration/Jazzy.rst → doc/migration.rst
diff --git a/doc/migration/Galactic.rst b/doc/migration/Galactic.rst
diff --git a/doc/release_notes/Jazzy.rst → doc/release_notes.rst b/doc/release_notes/Jazzy.rst → doc/release_notes.rst
diff --git a/hardware_interface/include/hardware_interface/resource_manager.hpp b/hardware_interface/include/hardware_interface/resource_manager.hpp
@@ -75,7 +75,7 @@ class HARDWARE_INTERFACE_PUBLIC ResourceManager
 
   ResourceManager(const ResourceManager &) = delete;
 
-  ~ResourceManager();
+  virtual ~ResourceManager();
 
   /// Load resources from on a given URDF.
   /**

diff --git a/hardware_interface_testing/test/test_resource_manager.cpp b/hardware_interface_testing/test/test_resource_manager.cpp
@@ -137,9 +137,9 @@ void test_load_and_initialized_components_failure(const std::string & urdf)
   EXPECT_FALSE(rm.command_interface_exists("joint3/max_acceleration"));
 }
 
-TEST_F(ResourceManagerTest, test_unitilizable_hardware)
+TEST_F(ResourceManagerTest, test_uninitializable_hardware)
 {
-  SCOPED_TRACE("test_unitilizable_hardware_no_validation");
+  SCOPED_TRACE("test_uninitializable_hardware_no_validation");
   // If the the hardware can not be initialized and load_and_initialize_components didn't try to
   // validate the interfaces, the interface should not show up
   test_load_and_initialized_components_failure(