Only wait for background tasks on tests that need them

test/test_helper.rb

@@ -26,10 +26,6 @@ class ActiveSupport::TestCase
  SolidCache::Entry.delete_all
  end
  end
-
- teardown do
- wait_for_background_tasks(@cache) if @cache
- end
 end
 
 def lookup_store(options = {})

test/unit/cluster_test.rb

@@ -15,6 +15,10 @@ class ClusterTest < ActiveSupport::TestCase
  @secondary_cache = lookup_store(expires_in: 60, cluster: secondary_cluster)
  end
 
+ teardown do
+ wait_for_background_tasks(@cache) if @cache
+ end
+
  test "writes to both clusters" do
  @cache.write("foo", 1)
  wait_for_background_tasks(@cache)

test/unit/execution_test.rb

@@ -13,6 +13,10 @@ class SolidCache::ExecutionTest < ActiveSupport::TestCase
  @cache = lookup_store(expiry_batch_size: 2, shards: nil)
  end
 
+ teardown do
+ wait_for_background_tasks(@cache) if @cache
+ end
+
  def test_async_errors_are_reported
  error_subscriber = ErrorSubscriber.new
  Rails.error.subscribe(error_subscriber)

test/unit/expiry_test.rb

@@ -11,6 +11,10 @@ class SolidCache::ExpiryTest < ActiveSupport::TestCase
  @namespace = "test-#{SecureRandom.hex}"
  end
 
+ teardown do
+ wait_for_background_tasks(@cache) if @cache
+ end
+
  [ :thread, :job ].each do |expiry_method|
  test "expires old records (#{expiry_method})" do
  SolidCache::Cluster.any_instance.stubs(:rand).returns(0)