test/scout/test_work_queue.rb in scout-gear-10.4.0 vs test/scout/test_work_queue.rb in scout-gear-10.7.0

@@ -89,11 +89,11 @@
     assert_equal 0, res.length
   end
 
   def test_queue_error
     5.times do |i|
-      num = 100
+      num = 20
       reps = 10_000
 
       q = WorkQueue.new num do |obj|
         raise ScoutException if rand < 0.1
         [Process.pid.to_s, obj.to_s] * " "
@@ -104,27 +104,29 @@
         res << out
       end
 
       Log.with_severity 7 do
         t = Thread.new do
-          Thread.current["name"] = "queue writer"
           Thread.current.report_on_exception = false
+          Thread.current["name"] = "queue writer"
           reps.times do |i|
             q.write i
           end
           q.close
         end
         Thread.pass until t["name"]
 
         assert_raise ScoutException do
           begin
+            t.join
             q.join(false)
           rescue
             t.raise($!)
             raise $!
           ensure
             t.join
+            q.close
           end
         end
       end
     end
   end
@@ -155,9 +157,10 @@
         end
         Thread.pass until t["name"]
 
         assert_raise ScoutException do
           begin
+            t.join
             q.join(false)
           rescue Exception
             t.raise($!)
             raise $!
           ensure