diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2020-11-30 21:24:44 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2020-11-30 21:24:44 +0100 |
| commit | 3d56e0f71adf16f8842f157c5f47c2c952377526 (patch) | |
| tree | afcec984bb33e81b83cd84aa71e5907e53e5c4f0 /config/src/tests | |
| parent | 0f2e5b7dba8f7009d227722b9491cc800d4f371b (diff) | |
Revert "Merge pull request #15549 from vespa-engine/revert-15543-bratseth/apply-on-restart-take-7"
This reverts commit 0f2e5b7dba8f7009d227722b9491cc800d4f371b, reversing
changes made to 1d5e07a044bff2aef764cfee0de10802c376e4b7.
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 a7cc95ab883..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) @@ -142,6 +142,7 @@ 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 85b9789821d..b4a8635f19e 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))); - 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); |