Commit a1e37672 authored by Marcin Siodelski's avatar Marcin Siodelski
Browse files

[3615] Restore default logging config for the tests which alter it.

parent 73bafb1f
...@@ -48,9 +48,6 @@ public: ...@@ -48,9 +48,6 @@ public:
BundyD2ControllerTest() : DControllerTest(D2Controller::instance) { BundyD2ControllerTest() : DControllerTest(D2Controller::instance) {
} }
/// @brief Destructor
~BundyD2ControllerTest() {
}
}; };
/// @brief Basic Controller instantiation testing. /// @brief Basic Controller instantiation testing.
......
...@@ -49,10 +49,6 @@ public: ...@@ -49,10 +49,6 @@ public:
D2ControllerTest() : DControllerTest(D2Controller::instance) { D2ControllerTest() : DControllerTest(D2Controller::instance) {
} }
/// @brief Destructor
~D2ControllerTest() {
}
/// @brief Fetches the D2Controller's D2Process /// @brief Fetches the D2Controller's D2Process
/// ///
/// @return A pointer to the process which may be null if it has not yet /// @return A pointer to the process which may be null if it has not yet
......
...@@ -41,9 +41,6 @@ public: ...@@ -41,9 +41,6 @@ public:
getController()); getController());
} }
virtual ~DStubControllerTest() {
}
DStubControllerPtr controller_; DStubControllerPtr controller_;
}; };
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
#include <d2/d_controller.h> #include <d2/d_controller.h>
#include <d2/d_cfg_mgr.h> #include <d2/d_cfg_mgr.h>
#include <log/logger_support.h>
#include <boost/date_time/posix_time/posix_time.hpp> #include <boost/date_time/posix_time/posix_time.hpp>
using namespace boost::posix_time; using namespace boost::posix_time;
...@@ -346,6 +348,11 @@ public: ...@@ -346,6 +348,11 @@ public:
/// Note the controller singleton is destroyed. This is essential to ensure /// Note the controller singleton is destroyed. This is essential to ensure
/// a clean start between tests. /// a clean start between tests.
virtual ~DControllerTest() { virtual ~DControllerTest() {
// Some unit tests update the logging configuration which has a side
// effect that all subsequent tests print the output to stdout. This
// is to ensure that the logging settings are back to default.
isc::log::setDefaultLoggingOutput();
if (write_timer_) { if (write_timer_) {
write_timer_->cancel(); write_timer_->cancel();
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment