commit 29b4128397772223a0baaf4b0211a06ad75c0d73
author Junxiao Shi <git@mail1.yoursunny.com> Mon Aug 22 03:47:02 2016 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Mon Aug 22 03:47:02 2016 +0000
tree 5418d650a6fdc1df7bcab5ca3b3aa3c62542c901
parent 331ade75dae15bf126b444f3b39852dce6babb3b

rib+tools: adapt to Controller::CommandFailCallback with ControlResponse

refs #3739

Change-Id: Icf5b3ed0bd997730a024bad2ccd258c8168b4ccb

tests/rib/auto-prefix-propagator.t.cpp

diff --git a/tests/rib/auto-prefix-propagator.t.cpp b/tests/rib/auto-prefix-propagator.t.cpp
index 7db7510..ebdf94b 100644
--- a/tests/rib/auto-prefix-propagator.t.cpp
+++ b/tests/rib/auto-prefix-propagator.t.cpp
@@ -631,8 +631,9 @@
     wasRetryEventTriggered = false;
 
     auto propagateParameters = m_propagator.getPrefixPropagationParameters(ribEntryPrefix);
-    m_propagator.afterPropagateFail(400, "test", propagateParameters.parameters, propagateParameters.options,
-                                     time::seconds(0), [&]{ wasRetryEventTriggered = true; });
+    m_propagator.afterPropagateFail(ndn::nfd::ControlResponse(400, "test"),
+                                    propagateParameters.parameters, propagateParameters.options,
+                                    time::seconds(0), [&] { wasRetryEventTriggered = true; });
     advanceClocks(time::milliseconds(1));
   };
 

tests/tools/nfdc/status-report.t.cpp

diff --git a/tests/tools/nfdc/status-report.t.cpp b/tests/tools/nfdc/status-report.t.cpp
index 2d89868..55e452c 100644
--- a/tests/tools/nfdc/status-report.t.cpp
+++ b/tests/tools/nfdc/status-report.t.cpp
@@ -72,7 +72,7 @@
   virtual void
   fetchStatus(Controller& controller,
               const function<void()>& onSuccess,
-              const Controller::CommandFailCallback& onFailure,
+              const Controller::DatasetFailCallback& onFailure,
               const CommandOptions& options) override
   {
     ++nFetchStatusCalls;