- Remove provider, Handler,Waitable, PollAble, Interruptable as separate interface.

- Hold the lock when closing the ConfigHolder so that noone risk getting stuck inside the wait_until.
- Use wait_until instead of poll.

2 files changed, 3 insertions, 3 deletions

diff --git a/config/src/tests/configagent/configagent.cpp b/config/src/tests/configagent/configagent.cpp
index c2d68c5d9a0..81422d198e0 100644
--- a/config/src/tests/configagent/configagent.cpp
+++ b/config/src/tests/configagent/configagent.cpp
@@ -103,7 +103,7 @@ public:
     }
 
     bool poll() override { return true; }
-    void interrupt() override { }
+    void close() override { }
 private:
     std::unique_ptr<ConfigUpdate> _update;
 };
diff --git a/config/src/tests/configholder/configholder.cpp b/config/src/tests/configholder/configholder.cpp
index 5ff0efc92dc..e22ef55d747 100644
--- a/config/src/tests/configholder/configholder.cpp
+++ b/config/src/tests/configholder/configholder.cpp
@@ -65,7 +65,7 @@ TEST("Require that negative time does not mean forever.") {
     EXPECT_LESS(timer.elapsed(), ONE_MINUTE);
 }
 
-TEST_MT_F("Require that wait is interrupted", 2, ConfigHolder)
+TEST_MT_F("Require that wait is interrupted on close", 2, ConfigHolder)
 {
     if (thread_id == 0) {
         vespalib::Timer timer;
@@ -77,7 +77,7 @@ TEST_MT_F("Require that wait is interrupted", 2, ConfigHolder)
     } else {
         TEST_BARRIER();
         std::this_thread::sleep_for(500ms);
-        f.interrupt();
+        f.close();
         TEST_BARRIER();
     }
 }