diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-11-29 13:39:48 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-11-29 13:39:48 +0100 |
commit | 2a1ef08ab314866268c69edaf8235f6aa635bfcb (patch) | |
tree | e917cee281d8e63c01365a992c86dfc6d9d85922 /config/src/tests | |
parent | 4dd991a350eb2fb75ac5e9a5fdfc517c2025adba (diff) |
Revert "Merge pull request #15510 from vespa-engine/revert-15508-bratseth/apply-on-restart-take-3"
This reverts commit 3c95d11418e3ebffc1260207932b7e8f3955e1a0, reversing
changes made to 7a1a70055770a82bf42bff668abaf011af3f6e55.
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); |