diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2020-12-04 22:30:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-04 22:30:51 +0100 |
| commit | fb23cab6f56aae990ea4ab9bced71a0be1ac0ab6 (patch) | |
| tree | d38173e0dbb0ff2986bbb9decdf53701880d2985 /config/src/tests | |
| parent | fcb2b4a2fd7a594520613c48d58e26963c68ea90 (diff) | |
Revert "Keep internal-redeploy serverside. Remove old restartOnDeploy impleme…"
Diffstat (limited to 'config/src/tests')
| -rw-r--r-- | config/src/tests/configagent/configagent.cpp | 3 | ||||
| -rw-r--r-- | config/src/tests/frt/frt.cpp | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/config/src/tests/configagent/configagent.cpp b/config/src/tests/configagent/configagent.cpp index d6766cce822..7cc0abee0bc 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), + _state(md5, timestamp, false, false), _errorMessage(errorMsg), _errorCode(errorC0de), _isError(iserror) @@ -141,6 +141,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); ASSERT_EQUAL(cs.applyOnRestart, handler.getConfigState().applyOnRestart); } diff --git a/config/src/tests/frt/frt.cpp b/config/src/tests/frt/frt.cpp index 0d70605fa62..60973aea2bf 100644 --- a/config/src/tests/frt/frt.cpp +++ b/config/src/tests/frt/frt.cpp @@ -276,10 +276,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))); - ASSERT_FALSE(v3req.verifyState(ConfigState(md5, 2, false))); - ASSERT_FALSE(v3req.verifyState(ConfigState("xxx", 3, false))); - ASSERT_FALSE(v3req.verifyState(ConfigState("xxx", 2, false))); + 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))); ConfigDefinition origDef(MyConfig::CONFIG_DEF_SCHEMA); |