Set Hosts/Services in tests as active where needed

diff --git a/test/icinga-checkable-flapping.cpp b/test/icinga-checkable-flapping.cpp
index 41646a0b115a191458ae9a47f619dd6c28001bf2..256c7b517063db1467698deee5dd86b3c12ab0bf 100644 (file)
--- a/test/icinga-checkable-flapping.cpp
+++ b/test/icinga-checkable-flapping.cpp
@@ -56,7 +56,7 @@ static void LogFlapping(const Checkable::Ptr& obj)
 static void LogHostStatus(const Host::Ptr &host)
 {
        std::cout << "Current status: state: " << host->GetState() << " state_type: " << host->GetStateType()
-               << " check attempt: " << host->GetCheckAttempt() << "/" << host->GetMaxCheckAttempts() << std::endl;
+               << " check attempt: " << host->GetCheckAttempt() << "/" << host->GetMaxCheckAttempts() << " Active: " << host->IsActive() << std::endl;
 }
 #endif /* I2_DEBUG */
 
@@ -73,6 +73,7 @@ BOOST_AUTO_TEST_CASE(host_not_flapping)
        host->SetName("test");
        host->SetEnableFlapping(true);
        host->SetMaxCheckAttempts(5);
+       host->SetActive(true);
 
        // Host otherwise is soft down
        host->SetState(HostUp);
@@ -116,6 +117,7 @@ BOOST_AUTO_TEST_CASE(host_flapping)
        host->SetName("test");
        host->SetEnableFlapping(true);
        host->SetMaxCheckAttempts(5);
+       host->SetActive(true);
 
        Utility::SetTime(0);
 
@@ -150,6 +152,7 @@ BOOST_AUTO_TEST_CASE(host_flapping_recover)
        host->SetName("test");
        host->SetEnableFlapping(true);
        host->SetMaxCheckAttempts(5);
+       host->SetActive(true);
 
        // Host otherwise is soft down
        host->SetState(HostUp);
@@ -209,6 +212,7 @@ BOOST_AUTO_TEST_CASE(host_flapping_docs_example)
        host->SetName("test");
        host->SetEnableFlapping(true);
        host->SetMaxCheckAttempts(5);
+       host->SetActive(true);
 
        // Host otherwise is soft down
        host->SetState(HostUp);

diff --git a/test/icinga-checkresult.cpp b/test/icinga-checkresult.cpp
index 9ea9626421424d1739ed3c1036306e162f3eedc8..fb024ce31affd8c1f1b88f9e54a17ac62ee7bd8d 100644 (file)
--- a/test/icinga-checkresult.cpp
+++ b/test/icinga-checkresult.cpp
@@ -63,6 +63,7 @@ BOOST_AUTO_TEST_CASE(host_1attempt)
        boost::signals2::connection c = Checkable::OnNotificationsRequested.connect(std::bind(&NotificationHandler, _1, _2));
 
        Host::Ptr host = new Host();
+       host->SetActive(true);
        host->SetMaxCheckAttempts(1);
        host->Activate();
        host->SetAuthority(true);
@@ -111,6 +112,7 @@ BOOST_AUTO_TEST_CASE(host_2attempts)
        boost::signals2::connection c = Checkable::OnNotificationsRequested.connect(std::bind(&NotificationHandler, _1, _2));
 
        Host::Ptr host = new Host();
+       host->SetActive(true);
        host->SetMaxCheckAttempts(2);
        host->Activate();
        host->SetAuthority(true);
@@ -166,6 +168,7 @@ BOOST_AUTO_TEST_CASE(host_3attempts)
        boost::signals2::connection c = Checkable::OnNotificationsRequested.connect(std::bind(&NotificationHandler, _1, _2));
 
        Host::Ptr host = new Host();
+       host->SetActive(true);
        host->SetMaxCheckAttempts(3);
        host->Activate();
        host->SetAuthority(true);
@@ -228,6 +231,7 @@ BOOST_AUTO_TEST_CASE(service_1attempt)
        boost::signals2::connection c = Checkable::OnNotificationsRequested.connect(std::bind(&NotificationHandler, _1, _2));
 
        Service::Ptr service = new Service();
+       service->SetActive(true);
        service->SetMaxCheckAttempts(1);
        service->Activate();
        service->SetAuthority(true);
@@ -276,6 +280,7 @@ BOOST_AUTO_TEST_CASE(service_2attempts)
        boost::signals2::connection c = Checkable::OnNotificationsRequested.connect(std::bind(&NotificationHandler, _1, _2));
 
        Service::Ptr service = new Service();
+       service->SetActive(true);
        service->SetMaxCheckAttempts(2);
        service->Activate();
        service->SetAuthority(true);
@@ -331,6 +336,7 @@ BOOST_AUTO_TEST_CASE(service_3attempts)
        boost::signals2::connection c = Checkable::OnNotificationsRequested.connect(std::bind(&NotificationHandler, _1, _2));
 
        Service::Ptr service = new Service();
+       service->SetActive(true);
        service->SetMaxCheckAttempts(3);
        service->Activate();
        service->SetAuthority(true);
@@ -398,6 +404,7 @@ BOOST_AUTO_TEST_CASE(host_flapping_notification)
        int timeStepInterval = 60;
 
        Host::Ptr host = new Host();
+       host->SetActive(true);
        host->Activate();
        host->SetAuthority(true);
        host->SetStateRaw(ServiceOK);
@@ -451,6 +458,7 @@ BOOST_AUTO_TEST_CASE(service_flapping_notification)
        int timeStepInterval = 60;
 
        Service::Ptr service = new Service();
+       service->SetActive(true);
        service->Activate();
        service->SetAuthority(true);
        service->SetStateRaw(ServiceOK);