From: Markus Frosch Date: Fri, 23 Mar 2018 12:31:34 +0000 (+0100) Subject: tests: Ensure IcingaApplication is initialized before adding config X-Git-Tag: v2.9.0~114^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=refs%2Fpull%2F6181%2Fhead;p=icinga2 tests: Ensure IcingaApplication is initialized before adding config This avoids an ordering problem noticed in Boost 1.55 --- diff --git a/test/livestatus-fixture.cpp b/test/livestatus-fixture.cpp index 8007b159a..c016ffe95 100644 --- a/test/livestatus-fixture.cpp +++ b/test/livestatus-fixture.cpp @@ -21,6 +21,7 @@ #include "config/configitem.hpp" #include "base/application.hpp" #include "base/loader.hpp" +#include "icingaapplication-fixture.hpp" #include using namespace icinga; @@ -29,6 +30,9 @@ struct LivestatusFixture { LivestatusFixture() { + // ensure IcingaApplication is initialized before we try to add config + IcingaApplicationFixture icinga; + BOOST_TEST_MESSAGE("Preparing config objects..."); ConfigItem::RunWithActivationContext(new Function("CreateTestObjects", CreateTestObjects));