[notelet-core] 01/01: Imported Upstream version 1.9.3

Jochen Sprickerhof jspricke-guest at moszumanska.debian.org
Wed Aug 5 19:06:52 UTC 2015


This is an automated email from the git hooks/post-receive script.

jspricke-guest pushed a commit to annotated tag upstream/1.9.3
in repository notelet-core.

commit aeed428fb57d463f7b6948ebbe5ac7787c124254
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Wed Aug 5 21:02:21 2015 +0200

    Imported Upstream version 1.9.3
---
 nodelet/CHANGELOG.rst                  |  6 +++
 nodelet/include/nodelet/nodelet.h      | 60 ++++++++++++++++++++++++++++++
 nodelet/package.xml                    |  2 +-
 nodelet/src/loader.cpp                 |  8 +++-
 nodelet_core/CHANGELOG.rst             |  5 +++
 nodelet_core/package.xml               |  4 +-
 nodelet_topic_tools/CHANGELOG.rst      |  3 ++
 nodelet_topic_tools/package.xml        |  2 +-
 test_nodelet/CHANGELOG.rst             |  5 +++
 test_nodelet/package.xml               |  2 +-
 test_nodelet/src/console_tests.cpp     | 67 ++++++++++++++++++++++++++++++++++
 test_nodelet_topic_tools/CHANGELOG.rst |  3 ++
 test_nodelet_topic_tools/package.xml   |  2 +-
 13 files changed, 161 insertions(+), 8 deletions(-)

diff --git a/nodelet/CHANGELOG.rst b/nodelet/CHANGELOG.rst
index 0cf31dd..95134c1 100644
--- a/nodelet/CHANGELOG.rst
+++ b/nodelet/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package nodelet
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.9.3 (2015-08-05)
+------------------
+* adding support for named nodelet loggers
+* nodelet loader: display error messages from both load attempts on failure
+* Contributors: Max Schwarz, Tully Foote
+
 1.9.2 (2014-10-30)
 ------------------
 * Fix dependency version
diff --git a/nodelet/include/nodelet/nodelet.h b/nodelet/include/nodelet/nodelet.h
index 43de92a..5e33011 100644
--- a/nodelet/include/nodelet/nodelet.h
+++ b/nodelet/include/nodelet/nodelet.h
@@ -100,6 +100,62 @@ class CallbackQueueInterface;
 #define NODELET_FATAL_FILTER(filter, ...) ROS_FATAL_FILTER_NAMED(filter, getName(), __VA_ARGS__)
 #define NODELET_FATAL_STREAM_FILTER(filter, ...) ROS_FATAL_STREAM_FILTER_NAMED(filter, getName(), __VA_ARGS__)
 
+// named versions of the macros
+#define NODELET_DEBUG_NAMED(suffix, ...) ROS_DEBUG_NAMED(getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_DEBUG_STREAM_NAMED(suffix, ...) ROS_DEBUG_STREAM_NAMED(getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_DEBUG_ONCE_NAMED(suffix, ...) ROS_DEBUG_ONCE_NAMED(getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_DEBUG_STREAM_ONCE_NAMED(suffix, ...) ROS_DEBUG_STREAM_ONCE_NAMED(getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_DEBUG_COND_NAMED(cond, suffix, ...) ROS_DEBUG_COND_NAMED(cond, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_DEBUG_STREAM_COND_NAMED(cond, suffix, ...) ROS_DEBUG_STREAM_COND_NAMED(cond, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_DEBUG_THROTTLE_NAMED(rate, suffix, ...) ROS_DEBUG_THROTTLE_NAMED(rate, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_DEBUG_STREAM_THROTTLE_NAMED(rate, suffix, ...) ROS_DEBUG_STREAM_THROTTLE_NAMED(rate, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_DEBUG_FILTER_NAMED(filter, suffix, ...) ROS_DEBUG_FILTER_NAMED(filter, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_DEBUG_STREAM_FILTER_NAMED(filter, suffix, ...) ROS_DEBUG_STREAM_FILTER_NAMED(filter, getSuffixedName(suffix), __VA_ARGS__)
+
+#define NODELET_INFO_NAMED(suffix, ...) ROS_INFO_NAMED(getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_INFO_STREAM_NAMED(suffix, ...) ROS_INFO_STREAM_NAMED(getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_INFO_ONCE_NAMED(suffix, ...) ROS_INFO_ONCE_NAMED(getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_INFO_STREAM_ONCE_NAMED(suffix, ...) ROS_INFO_STREAM_ONCE_NAMED(getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_INFO_COND_NAMED(cond, suffix, ...) ROS_INFO_COND_NAMED(cond, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_INFO_STREAM_COND_NAMED(cond, suffix, ...) ROS_INFO_STREAM_COND_NAMED(cond, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_INFO_THROTTLE_NAMED(rate, suffix, ...) ROS_INFO_THROTTLE_NAMED(rate, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_INFO_STREAM_THROTTLE_NAMED(rate, suffix, ...) ROS_INFO_STREAM_THROTTLE_NAMED(rate, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_INFO_FILTER_NAMED(filter, suffix, ...) ROS_INFO_FILTER_NAMED(filter, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_INFO_STREAM_FILTER_NAMED(filter, suffix, ...) ROS_INFO_STREAM_FILTER_NAMED(filter, getSuffixedName(suffix), __VA_ARGS__)
+
+#define NODELET_WARN_NAMED(suffix, ...) ROS_WARN_NAMED(getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_WARN_STREAM_NAMED(suffix, ...) ROS_WARN_STREAM_NAMED(getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_WARN_ONCE_NAMED(suffix, ...) ROS_WARN_ONCE_NAMED(getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_WARN_STREAM_ONCE_NAMED(suffix, ...) ROS_WARN_STREAM_ONCE_NAMED(getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_WARN_COND_NAMED(cond, suffix, ...) ROS_WARN_COND_NAMED(cond, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_WARN_STREAM_COND_NAMED(cond, suffix, ...) ROS_WARN_STREAM_COND_NAMED(cond, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_WARN_THROTTLE_NAMED(rate, suffix, ...) ROS_WARN_THROTTLE_NAMED(rate, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_WARN_STREAM_THROTTLE_NAMED(rate, suffix, ...) ROS_WARN_STREAM_THROTTLE_NAMED(rate, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_WARN_FILTER_NAMED(filter, suffix, ...) ROS_WARN_FILTER_NAMED(filter, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_WARN_STREAM_FILTER_NAMED(filter, suffix, ...) ROS_WARN_STREAM_FILTER_NAMED(filter, getSuffixedName(suffix), __VA_ARGS__)
+
+#define NODELET_ERROR_NAMED(suffix, ...) ROS_ERROR_NAMED(getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_ERROR_STREAM_NAMED(suffix, ...) ROS_ERROR_STREAM_NAMED(getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_ERROR_ONCE_NAMED(suffix, ...) ROS_ERROR_ONCE_NAMED(getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_ERROR_STREAM_ONCE_NAMED(suffix, ...) ROS_ERROR_STREAM_ONCE_NAMED(getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_ERROR_COND_NAMED(cond, suffix, ...) ROS_ERROR_COND_NAMED(cond, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_ERROR_STREAM_COND_NAMED(cond, suffix, ...) ROS_ERROR_STREAM_COND_NAMED(cond, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_ERROR_THROTTLE_NAMED(rate, suffix, ...) ROS_ERROR_THROTTLE_NAMED(rate, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_ERROR_STREAM_THROTTLE_NAMED(rate, suffix, ...) ROS_ERROR_STREAM_THROTTLE_NAMED(rate, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_ERROR_FILTER_NAMED(filter, suffix, ...) ROS_ERROR_FILTER_NAMED(filter, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_ERROR_STREAM_FILTER_NAMED(filter, suffix, ...) ROS_ERROR_STREAM_FILTER_NAMED(filter, getSuffixedName(suffix), __VA_ARGS__)
+
+#define NODELET_FATAL_NAMED(suffix, ...) ROS_FATAL_NAMED(getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_FATAL_STREAM_NAMED(suffix, ...) ROS_FATAL_STREAM_NAMED(getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_FATAL_ONCE_NAMED(suffix, ...) ROS_FATAL_ONCE_NAMED(getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_FATAL_STREAM_ONCE_NAMED(suffix, ...) ROS_FATAL_STREAM_ONCE_NAMED(getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_FATAL_COND_NAMED(cond, suffix, ...) ROS_FATAL_COND_NAMED(cond, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_FATAL_STREAM_COND_NAMED(cond, suffix, ...) ROS_FATAL_STREAM_COND_NAMED(cond, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_FATAL_THROTTLE_NAMED(rate, suffix, ...) ROS_FATAL_THROTTLE_NAMED(rate, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_FATAL_STREAM_THROTTLE_NAMED(rate, suffix, ...) ROS_FATAL_STREAM_THROTTLE_NAMED(rate, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_FATAL_FILTER_NAMED(filter, suffix, ...) ROS_FATAL_FILTER_NAMED(filter, getSuffixedName(suffix), __VA_ARGS__)
+#define NODELET_FATAL_STREAM_FILTER_NAMED(filter, suffix, ...) ROS_FATAL_STREAM_FILTER_NAMED(filter, getSuffixedName(suffix), __VA_ARGS__)
+
 namespace nodelet
 {
 typedef boost::shared_ptr<ros::NodeHandle> NodeHandlePtr;
@@ -127,6 +183,10 @@ class Nodelet
   // Protected data fields for use by the subclass.
 protected:
   inline const std::string& getName() const { return nodelet_name_; }
+  inline std::string getSuffixedName(const std::string& suffix) const
+  {
+    return nodelet_name_ + "." + suffix;
+  }
   inline const V_string& getMyArgv() const { return my_argv_; }
 
   ros::NodeHandle& getNodeHandle() const;
diff --git a/nodelet/package.xml b/nodelet/package.xml
index fde2216..1798aed 100644
--- a/nodelet/package.xml
+++ b/nodelet/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>nodelet</name>
-  <version>1.9.2</version>
+  <version>1.9.3</version>
   <description>
     The nodelet package is designed to provide a way to run multiple
     algorithms in the same process with zero copy transport between
diff --git a/nodelet/src/loader.cpp b/nodelet/src/loader.cpp
index 2812fbf..198b3c4 100644
--- a/nodelet/src/loader.cpp
+++ b/nodelet/src/loader.cpp
@@ -280,9 +280,13 @@ bool Loader::load(const std::string &name, const std::string& type, const ros::M
       impl_->refresh_classes_();
       p = impl_->create_instance_(type);
     }
-    catch (std::runtime_error& e)
+    catch (std::runtime_error& e2)
     {
-      ROS_ERROR("Failed to load nodelet [%s] of type [%s]: %s", name.c_str(), type.c_str(), e.what());
+      // dlopen() can return inconsistent results currently (see
+      // https://sourceware.org/bugzilla/show_bug.cgi?id=17833), so make sure
+      // that we display the messages of both exceptions to the user.
+      ROS_ERROR("Failed to load nodelet [%s] of type [%s] even after refreshing the cache: %s", name.c_str(), type.c_str(), e2.what());
+      ROS_ERROR("The error before refreshing the cache was: %s", e.what());
       return false;
     }
   }
diff --git a/nodelet_core/CHANGELOG.rst b/nodelet_core/CHANGELOG.rst
index 8675625..98df954 100644
--- a/nodelet_core/CHANGELOG.rst
+++ b/nodelet_core/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package nodelet_core
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.9.3 (2015-08-05)
+------------------
+* Update bugtracker url
+* Contributors: Esteve Fernandez
+
 1.9.2 (2014-10-30)
 ------------------
 
diff --git a/nodelet_core/package.xml b/nodelet_core/package.xml
index 68daf60..3b95ce6 100644
--- a/nodelet_core/package.xml
+++ b/nodelet_core/package.xml
@@ -1,12 +1,12 @@
 <package>
   <name>nodelet_core</name>
-  <version>1.9.2</version>
+  <version>1.9.3</version>
   <description>Nodelet Core Metapackage</description>
   <maintainer email="esteve at osrfoundation.org">Esteve Fernandez</maintainer>
   <license>BSD</license>
   
   <url type="website">http://www.ros.org/wiki/nodelet_core</url>
-  <url type="bugtracker">https://code.ros.org/trac/ros-pkg/query?component=common&status=assigned&status=new&status=reopened</url>
+  <url type="bugtracker">https://github.com/ros/nodelet_core/issues</url>
   <url type="repository">https://github.com/ros/nodelet_core</url>
   
   <author>Tully Foote</author>
diff --git a/nodelet_topic_tools/CHANGELOG.rst b/nodelet_topic_tools/CHANGELOG.rst
index fb650c1..3a7a40e 100644
--- a/nodelet_topic_tools/CHANGELOG.rst
+++ b/nodelet_topic_tools/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package nodelet_topic_tools
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.9.3 (2015-08-05)
+------------------
+
 1.9.2 (2014-10-30)
 ------------------
 
diff --git a/nodelet_topic_tools/package.xml b/nodelet_topic_tools/package.xml
index 49cc901..08dd02d 100644
--- a/nodelet_topic_tools/package.xml
+++ b/nodelet_topic_tools/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>nodelet_topic_tools</name>
-  <version>1.9.2</version>
+  <version>1.9.3</version>
   <description>
     This package contains common nodelet tools such as a mux, demux and throttle.
   </description>
diff --git a/test_nodelet/CHANGELOG.rst b/test_nodelet/CHANGELOG.rst
index cd2b959..1b899c3 100644
--- a/test_nodelet/CHANGELOG.rst
+++ b/test_nodelet/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package test_nodelet
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.9.3 (2015-08-05)
+------------------
+* adding support for named nodelet loggers
+* Contributors: Tully Foote
+
 1.9.2 (2014-10-30)
 ------------------
 
diff --git a/test_nodelet/package.xml b/test_nodelet/package.xml
index 3b2b5d4..86ddc15 100644
--- a/test_nodelet/package.xml
+++ b/test_nodelet/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>test_nodelet</name>
-  <version>1.9.2</version>
+  <version>1.9.3</version>
   <description>
     A package for nodelet unit tests
   </description>
diff --git a/test_nodelet/src/console_tests.cpp b/test_nodelet/src/console_tests.cpp
index 4a0f644..cee20d4 100644
--- a/test_nodelet/src/console_tests.cpp
+++ b/test_nodelet/src/console_tests.cpp
@@ -44,6 +44,8 @@ class ConsoleTest : public nodelet::Nodelet
 private:
   virtual void onInit()
   {
+    std::string suffix("logger_suffix");
+
     NODELET_DEBUG("DEBUG output");
     NODELET_DEBUG_STREAM("DEBUG" << " output");
     NODELET_DEBUG_ONCE("DEBUG output");
@@ -57,6 +59,19 @@ private:
     //TODO TEST FILTERS
     //NODELET_DEBUG_FILTER(10.0, "DEBUG output");
     //NODELET_DEBUG_STREAM_FILTER(10.0, "DEBUG" << " output");
+    NODELET_DEBUG_NAMED(suffix, "DEBUG output");
+    NODELET_DEBUG_STREAM_NAMED(suffix, "DEBUG" << " output");
+    NODELET_DEBUG_ONCE_NAMED(suffix, "DEBUG output");
+    NODELET_DEBUG_STREAM_ONCE_NAMED(suffix, "DEBUG" << " output");
+    NODELET_DEBUG_COND_NAMED(1 == 1, suffix, "DEBUG output");
+    NODELET_DEBUG_STREAM_COND_NAMED(1 == 1, suffix, "DEBUG" << " output");
+    NODELET_DEBUG_COND_NAMED(1 == 0, suffix, "DEBUG output unseen");
+    NODELET_DEBUG_STREAM_COND_NAMED(1 == 0, suffix, "DEBUG" << " output unseen");
+    NODELET_DEBUG_THROTTLE_NAMED(10.0, suffix, "DEBUG output");
+    NODELET_DEBUG_STREAM_THROTTLE_NAMED(10.0, suffix, "DEBUG" << " output");
+    //TODO TEST FILTERS
+    //NODELET_DEBUG_FILTER_NAMED(10.0, suffix,  "DEBUG output");
+    //NODELET_DEBUG_STREAM_FILTER_NAMED(10.0, suffix, "DEBUG" << " output");
 
     NODELET_INFO("INFO output");
     NODELET_INFO_STREAM("INFO" << " output");
@@ -71,6 +86,19 @@ private:
     //TODO TEST FILTERS
     //NODELET_INFO_FILTER(10.0, "INFO output");
     //NODELET_INFO_STREAM_FILTER(10.0, "INFO" << " output");
+    NODELET_INFO_NAMED(suffix, "INFO output");
+    NODELET_INFO_STREAM_NAMED(suffix, "INFO" << " output");
+    NODELET_INFO_ONCE_NAMED(suffix, "INFO output");
+    NODELET_INFO_STREAM_ONCE_NAMED(suffix, "INFO" << " output");
+    NODELET_INFO_COND_NAMED(1 == 1, suffix, "INFO output");
+    NODELET_INFO_STREAM_COND_NAMED(1 == 1, suffix, "INFO" << " output");
+    NODELET_INFO_COND_NAMED(1 == 0, suffix, "INFO output unseen");
+    NODELET_INFO_STREAM_COND_NAMED(1 == 0, suffix, "INFO" << " output unseen");
+    NODELET_INFO_THROTTLE_NAMED(10.0, suffix, "INFO output");
+    NODELET_INFO_STREAM_THROTTLE_NAMED(10.0, suffix, "INFO" << " output");
+    //TODO TEST FILTERS
+    //NODELET_INFO_FILTER_NAMED(10.0, suffix,  "INFO output");
+    //NODELET_INFO_STREAM_FILTER_NAMED(10.0, suffix, "INFO" << " output");
 
     NODELET_WARN("WARN output");
     NODELET_WARN_STREAM("WARN" << " output");
@@ -85,6 +113,19 @@ private:
     //TODO TEST FILTERS
     //NODELET_WARN_FILTER(10.0, "WARN output");
     //NODELET_WARN_STREAM_FILTER(10.0, "WARN" << " output");
+    NODELET_WARN_NAMED(suffix, "WARN output");
+    NODELET_WARN_STREAM_NAMED(suffix, "WARN" << " output");
+    NODELET_WARN_ONCE_NAMED(suffix, "WARN output");
+    NODELET_WARN_STREAM_ONCE_NAMED(suffix, "WARN" << " output");
+    NODELET_WARN_COND_NAMED(1 == 1, suffix, "WARN output");
+    NODELET_WARN_STREAM_COND_NAMED(1 == 1, suffix, "WARN" << " output");
+    NODELET_WARN_COND_NAMED(1 == 0, suffix, "WARN output unseen");
+    NODELET_WARN_STREAM_COND_NAMED(1 == 0, suffix, "WARN" << " output unseen");
+    NODELET_WARN_THROTTLE_NAMED(10.0, suffix, "WARN output");
+    NODELET_WARN_STREAM_THROTTLE_NAMED(10.0, suffix, "WARN" << " output");
+    //TODO TEST FILTERS
+    //NODELET_WARN_FILTER_NAMED(10.0, suffix,  "WARN output");
+    //NODELET_WARN_STREAM_FILTER_NAMED(10.0, suffix, "WARN" << " output");
 
     NODELET_ERROR("ERROR output");
     NODELET_ERROR_STREAM("ERROR" << " output");
@@ -99,6 +140,19 @@ private:
     //TODO TEST FILTERS
     //NODELET_ERROR_FILTER(10.0, "ERROR output");
     //NODELET_ERROR_STREAM_FILTER(10.0, "ERROR" << " output");
+    NODELET_ERROR_NAMED(suffix, "ERROR output");
+    NODELET_ERROR_STREAM_NAMED(suffix, "ERROR" << " output");
+    NODELET_ERROR_ONCE_NAMED(suffix, "ERROR output");
+    NODELET_ERROR_STREAM_ONCE_NAMED(suffix, "ERROR" << " output");
+    NODELET_ERROR_COND_NAMED(1 == 1, suffix, "ERROR output");
+    NODELET_ERROR_STREAM_COND_NAMED(1 == 1, suffix, "ERROR" << " output");
+    NODELET_ERROR_COND_NAMED(1 == 0, suffix, "ERROR output unseen");
+    NODELET_ERROR_STREAM_COND_NAMED(1 == 0, suffix, "ERROR" << " output unseen");
+    NODELET_ERROR_THROTTLE_NAMED(10.0, suffix, "ERROR output");
+    NODELET_ERROR_STREAM_THROTTLE_NAMED(10.0, suffix, "ERROR" << " output");
+    //TODO TEST FILTERS
+    //NODELET_ERROR_FILTER_NAMED(10.0, suffix,  "ERROR output");
+    //NODELET_ERROR_STREAM_FILTER_NAMED(10.0, suffix, "ERROR" << " output");
 
     NODELET_FATAL("FATAL output");
     NODELET_FATAL_STREAM("FATAL" << " output");
@@ -113,6 +167,19 @@ private:
     //TODO TEST FILTERS
     //NODELET_FATAL_FILTER(10.0, "FATAL output");
     //NODELET_FATAL_STREAM_FILTER(10.0, "FATAL" << " output");
+    NODELET_FATAL_NAMED(suffix, "FATAL output");
+    NODELET_FATAL_STREAM_NAMED(suffix, "FATAL" << " named output");
+    NODELET_FATAL_ONCE_NAMED(suffix, "FATAL named output");
+    NODELET_FATAL_STREAM_ONCE_NAMED(suffix, "FATAL" << " named output");
+    NODELET_FATAL_COND_NAMED(1 == 1, suffix, "FATAL named output");
+    NODELET_FATAL_STREAM_COND_NAMED(1 == 1, suffix, "FATAL" << " named output");
+    NODELET_FATAL_COND_NAMED(1 == 0, suffix, "FATAL named output unseen");
+    NODELET_FATAL_STREAM_COND_NAMED(1 == 0, suffix, "FATAL" << " named output unseen");
+    NODELET_FATAL_THROTTLE_NAMED(10.0, suffix, "FATAL named output");
+    NODELET_FATAL_STREAM_THROTTLE_NAMED(10.0, suffix, "FATAL" << " named output");
+    //TODO TEST FILTERS
+    //NODELET_FATAL_FILTER_NAMED(10.0, suffix,  "FATAL named output");
+    //NODELET_FATAL_STREAM_FILTER_NAMED(10.0, suffix, "FATAL" << " named output");
 
     
   }
diff --git a/test_nodelet_topic_tools/CHANGELOG.rst b/test_nodelet_topic_tools/CHANGELOG.rst
index b588638..a69da37 100644
--- a/test_nodelet_topic_tools/CHANGELOG.rst
+++ b/test_nodelet_topic_tools/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package test_nodelet_topic_tools
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.9.3 (2015-08-05)
+------------------
+
 1.9.2 (2014-10-30)
 ------------------
 
diff --git a/test_nodelet_topic_tools/package.xml b/test_nodelet_topic_tools/package.xml
index 9eb3207..06fb11b 100644
--- a/test_nodelet_topic_tools/package.xml
+++ b/test_nodelet_topic_tools/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>test_nodelet_topic_tools</name>
-  <version>1.9.2</version>
+  <version>1.9.3</version>
   <description>
     A package for nodelet_topic_tools unit tests.
   </description>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/notelet-core.git



More information about the debian-science-commits mailing list