Only reset when nothing has changed and the whole changeset has been consumed.

2 files changed, 12 insertions, 12 deletions

diff --git a/config/src/tests/subscriber/subscriber.cpp b/config/src/tests/subscriber/subscriber.cpp
index 7613ba41234..39a537486cd 100644
--- a/config/src/tests/subscriber/subscriber.cpp
+++ b/config/src/tests/subscriber/subscriber.cpp
@@ -341,22 +341,22 @@ TEST_FF("requireThatHandlesAreMarkedAsChanged", MyManager, APIFixture(f1)) {
     ConfigSubscriber s(IConfigContext::SP(new APIFixture(f2)));
     ConfigHandle<FooConfig>::UP h1 = s.subscribe<FooConfig>("myid2");
     ConfigHandle<BarConfig>::UP h2 = s.subscribe<BarConfig>("myid2");
-    ASSERT_FALSE(s.nextConfig(0));
+    EXPECT_FALSE(s.nextConfig(0));
 
     f1.updateValue(0, createFooValue("foo"), 1);
     f1.updateValue(1, createFooValue("bar"), 1);
-    ASSERT_TRUE(s.nextConfig(100));
-    ASSERT_TRUE(h1->isChanged());
-    ASSERT_TRUE(h2->isChanged());
+    EXPECT_TRUE(s.nextConfig(100));
+    EXPECT_TRUE(h1->isChanged());
+    EXPECT_TRUE(h2->isChanged());
 
-    ASSERT_FALSE(s.nextConfig(100));
-    ASSERT_FALSE(h1->isChanged());
-    ASSERT_FALSE(h2->isChanged());
+    EXPECT_FALSE(s.nextConfig(100));
+    EXPECT_FALSE(h1->isChanged());
+    EXPECT_FALSE(h2->isChanged());
     f1.updateValue(0, createFooValue("bar"), 2);
     f1.updateGeneration(1, 2);
-    ASSERT_TRUE(s.nextConfig(100));
-    ASSERT_TRUE(h1->isChanged());
-    ASSERT_FALSE(h2->isChanged());
+    EXPECT_TRUE(s.nextConfig(100));
+    EXPECT_TRUE(h1->isChanged());
+    EXPECT_FALSE(h2->isChanged());
 }
 
 TEST_FF("requireThatNextGenerationMarksChanged", MyManager, APIFixture(f1)) {
diff --git a/config/src/tests/subscription/subscription.cpp b/config/src/tests/subscription/subscription.cpp
index 5d36753813c..a9e4c923e92 100644
--- a/config/src/tests/subscription/subscription.cpp
+++ b/config/src/tests/subscription/subscription.cpp
@@ -101,11 +101,11 @@ TEST_MT_F("requireThatNextUpdateReturnsInterrupted", 2, SubscriptionFixture(Conf
 
 TEST_F("Require that isChanged takes generation into account", SubscriptionFixture(ConfigKey::create<MyConfig>("myid")))
 {
-    f1.holder->handle(ConfigUpdate::UP(new ConfigUpdate(ConfigValue(), true, 1)));
+    f1.holder->handle(ConfigUpdate::UP(new ConfigUpdate(ConfigValue(std::vector<vespalib::string>(), "a"), true, 1)));
     ASSERT_TRUE(f1.sub.nextUpdate(0, 0));
     f1.sub.flip();
     ASSERT_EQUAL(1, f1.sub.getLastGenerationChanged());
-    f1.holder->handle(ConfigUpdate::UP(new ConfigUpdate(ConfigValue(), true, 2)));
+    f1.holder->handle(ConfigUpdate::UP(new ConfigUpdate(ConfigValue(std::vector<vespalib::string>(), "b"), true, 2)));
     ASSERT_TRUE(f1.sub.nextUpdate(1, 0));
     f1.sub.flip();
     ASSERT_EQUAL(2, f1.sub.getLastGenerationChanged());