aboutsummaryrefslogtreecommitdiffstats
path: root/config/src/tests/frt
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2020-12-07 09:55:42 +0100
committerJon Bratseth <bratseth@gmail.com>2020-12-07 09:55:42 +0100
commitddac99566ca559b720304299351ec4032e73e736 (patch)
tree6f929c9bed5524ab90d17e51d24eeeda3fe36909 /config/src/tests/frt
parentc183491dd0d3ad22477f4c1f884bec07156956bf (diff)
Revert "Merge pull request #15690 from vespa-engine/revert-15686-bratseth/simplify-config"
This reverts commit a90709008ec0d108ee9a2e26bda20e39a10424b5, reversing changes made to fcb2b4a2fd7a594520613c48d58e26963c68ea90.
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 60973aea2bf..0d70605fa62 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, 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)));
+ 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)));
ConfigDefinition origDef(MyConfig::CONFIG_DEF_SCHEMA);