summaryrefslogtreecommitdiffstats
path: root/config/src/tests/frt
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2020-11-30 16:09:32 +0100
committerJon Bratseth <bratseth@gmail.com>2020-11-30 16:09:32 +0100
commita140a180467ccc2c2325f0ef0396db7a07022f5d (patch)
treeac476ec91a2392e032b16144c14cbcae51a45023 /config/src/tests/frt
parentcf34278a1f367301a740d9781cd07d32175bbd49 (diff)
Revert "Merge pull request #15542 from vespa-engine/revert-15540-bratseth/apply-on-restart-take-6"
This reverts commit cf34278a1f367301a740d9781cd07d32175bbd49, reversing changes made to 9d64924f89a48e712403fb73808e2280bfe3dfe3.
Diffstat (limited to 'config/src/tests/frt')
-rw-r--r--config/src/tests/frt/frt.cpp8
1 files changed, 4 insertions, 4 deletions
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);