diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-11-27 10:35:20 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-11-27 10:35:20 +0100 |
commit | 0facde033e35dbd0510c095519e322667ba278bd (patch) | |
tree | 50a840996e7c47a4287488bfd03dd04c4f49427e /config/src/tests/frt | |
parent | 7a60abe577e6cd9cbbe2b3aa62d7220ff5b191ec (diff) |
Revert "Merge pull request #15495 from vespa-engine/revert-15494-bratseth/apply-on-restart-take-2"
This reverts commit ef4ece0ae64a1f1ec8accb257168b2a08d6971b1, reversing
changes made to 204eb6f5faf91a6159ba5c7e01d2d8b6f307e8bd.
Diffstat (limited to 'config/src/tests/frt')
-rw-r--r-- | config/src/tests/frt/frt.cpp | 8 |
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); |