diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-12-07 17:48:45 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-12-07 20:05:00 +0100 |
commit | 4e0107cd88ec399517747dbe6c9060ef48dcbe1d (patch) | |
tree | 87319fd9d5718a26fe9b162569b15510a72be693 /config/src/tests | |
parent | 89731416ff74bb9b7e8f94fb5a8b942aa08cabb8 (diff) |
Avoid unnecessary reconfig.
Diffstat (limited to 'config/src/tests')
-rw-r--r-- | config/src/tests/configagent/configagent.cpp | 3 | ||||
-rw-r--r-- | config/src/tests/configholder/configholder.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/config/src/tests/configagent/configagent.cpp b/config/src/tests/configagent/configagent.cpp index f6593890975..bc90cb458db 100644 --- a/config/src/tests/configagent/configagent.cpp +++ b/config/src/tests/configagent/configagent.cpp @@ -100,6 +100,9 @@ public: void handle(std::unique_ptr<ConfigUpdate> update) override { + if (_update) { + update->merge(*_update); + } _update = std::move(update); } diff --git a/config/src/tests/configholder/configholder.cpp b/config/src/tests/configholder/configholder.cpp index 83249da3824..2c6fa2016bf 100644 --- a/config/src/tests/configholder/configholder.cpp +++ b/config/src/tests/configholder/configholder.cpp @@ -46,7 +46,7 @@ TEST("Require that polling for elements work") holder.handle(ConfigUpdate::UP(new ConfigUpdate(value, true, 0))); ASSERT_TRUE(holder.poll()); holder.provide(); - ASSERT_TRUE(holder.poll()); + ASSERT_FALSE(holder.poll()); } TEST_MT_F("Require that wait is interrupted", 2, ConfigHolder) |