summaryrefslogtreecommitdiffstats
path: root/config/src/tests
diff options
context:
space:
mode:
Diffstat (limited to 'config/src/tests')
-rw-r--r--config/src/tests/configagent/configagent.cpp3
-rw-r--r--config/src/tests/frt/frt.cpp8
2 files changed, 5 insertions, 6 deletions
diff --git a/config/src/tests/configagent/configagent.cpp b/config/src/tests/configagent/configagent.cpp
index 7cc0abee0bc..a7cc95ab883 100644
--- a/config/src/tests/configagent/configagent.cpp
+++ b/config/src/tests/configagent/configagent.cpp
@@ -36,7 +36,7 @@ public:
_value(value),
_fillCalled(false),
_valid(valid),
- _state(md5, timestamp, false, false),
+ _state(md5, timestamp, false),
_errorMessage(errorMsg),
_errorCode(errorC0de),
_isError(iserror)
@@ -142,7 +142,6 @@ TEST("require that agent returns correct values") {
ASSERT_EQUAL(cs.md5, handler.getConfigState().md5);
ASSERT_EQUAL(cs.generation, handler.getConfigState().generation);
ASSERT_EQUAL(cs.internalRedeploy, handler.getConfigState().internalRedeploy);
- ASSERT_EQUAL(cs.applyOnRestart, handler.getConfigState().applyOnRestart);
}
TEST("require that successful request is delivered to holder") {
diff --git a/config/src/tests/frt/frt.cpp b/config/src/tests/frt/frt.cpp
index b4a8635f19e..85b9789821d 100644
--- a/config/src/tests/frt/frt.cpp
+++ b/config/src/tests/frt/frt.cpp
@@ -277,10 +277,10 @@ TEST("require that v3 request is correctly initialized") {
traceIn.trace(2, "Hei");
FRTConfigRequestV3 v3req(&conn, key, md5, currentGeneration, hostName,
timeout, traceIn, VespaVersion::fromString("1.2.3"), CompressionType::LZ4);
- ASSERT_TRUE(v3req.verifyState(ConfigState(md5, 3, false, false)));
- ASSERT_FALSE(v3req.verifyState(ConfigState(md5, 2, false, false)));
- ASSERT_FALSE(v3req.verifyState(ConfigState("xxx", 3, false, false)));
- ASSERT_FALSE(v3req.verifyState(ConfigState("xxx", 2, false, false)));
+ ASSERT_TRUE(v3req.verifyState(ConfigState(md5, 3, false)));
+ ASSERT_FALSE(v3req.verifyState(ConfigState(md5, 2, false)));
+ ASSERT_FALSE(v3req.verifyState(ConfigState("xxx", 3, false)));
+ ASSERT_FALSE(v3req.verifyState(ConfigState("xxx", 2, false)));
ConfigDefinition origDef(MyConfig::CONFIG_DEF_SCHEMA);