summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2018-06-10 20:32:15 +0200
committerHarald Musum <musum@oath.com>2018-06-10 20:32:15 +0200
commit314bad4602bc02069de5117ec7a62b4ef24b0def (patch)
treea55259ea1856a9263f4ed3147bf96e41cc4ded99 /config
parent38d482d4e1ae1b34edba6c02e7404ce3c4e42bc3 (diff)
Update tests
Diffstat (limited to 'config')
-rw-r--r--config/src/tests/configagent/configagent.cpp3
-rw-r--r--config/src/tests/frt/frt.cpp8
2 files changed, 6 insertions, 5 deletions
diff --git a/config/src/tests/configagent/configagent.cpp b/config/src/tests/configagent/configagent.cpp
index bc90cb458db..328959fb34d 100644
--- a/config/src/tests/configagent/configagent.cpp
+++ b/config/src/tests/configagent/configagent.cpp
@@ -35,7 +35,7 @@ public:
_value(value),
_fillCalled(false),
_valid(valid),
- _state(md5, timestamp),
+ _state(md5, timestamp, false),
_errorMessage(errorMsg),
_errorCode(errorC0de),
_isError(iserror)
@@ -140,6 +140,7 @@ TEST("require that agent returns correct values") {
ConfigState cs;
ASSERT_EQUAL(cs.md5, handler.getConfigState().md5);
ASSERT_EQUAL(cs.generation, handler.getConfigState().generation);
+ ASSERT_EQUAL(cs.internalRedeploy, handler.getConfigState().internalRedeploy);
}
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 5f4b7dee215..b616861c799 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, wantedGeneration, hostName,
timeout, traceIn, VespaVersion::fromString("1.2.3"), CompressionType::LZ4);
- ASSERT_TRUE(v3req.verifyState(ConfigState(md5, 3)));
- ASSERT_FALSE(v3req.verifyState(ConfigState(md5, 2)));
- ASSERT_FALSE(v3req.verifyState(ConfigState("xxx", 3)));
- ASSERT_FALSE(v3req.verifyState(ConfigState("xxx", 2)));
+ 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);