Merge pull request #2896 from ganmacs/fix-unstable-in_tail-test

Wait until `@tails` is set a new watcher
fluent · Mar 18, 2020 · 5181d10 · 5181d10
2 parents c8347ff + f3a0518
commit 5181d10
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/test/plugin/test_in_tail.rb b/test/plugin/test_in_tail.rb
@@ -1078,11 +1078,11 @@ def test_unwatched_files_should_be_removed
                                 "refresh_interval" => 1,
                               })
       d = create_driver(config, false)
-      d.run(expect_emits: 1, shutdown: false) do
+      d.end_if { d.instance.instance_variable_get(:@tails).keys.size >= 1 }
+      d.run(expect_emits: 1, shutdown: false, timeout: 1) do
         File.open("#{TMP_DIR}/tail.txt", "ab") { |f| f.puts "test3\n" }
       end
 
-      assert_equal 1, d.instance.instance_variable_get(:@tails).keys.size
       cleanup_directory(TMP_DIR)
       waiting(20) { sleep 0.1 until Dir.glob("#{TMP_DIR}/*.txt").size == 0 } # Ensure file is deleted on Windows
       waiting(5) { sleep 0.1 until d.instance.instance_variable_get(:@tails).keys.size == 0 }