Try parallel testing. Hacky fix for redis connections per process

Author: fbacall

app/models/concerns/has_test_job.rb

@@ -2,11 +2,11 @@ module HasTestJob
   extend ActiveSupport::Concern
 
   def test_job_id
-    Redis.new(url: TeSS::Config.redis_url).get(test_job_id_key)
+    TeSS::Config.redis.get(test_job_id_key)
   end
 
   def test_job_id=(job_id)
-    Redis.new(url: TeSS::Config.redis_url).set(test_job_id_key, job_id)
+    TeSS::Config.redis.set(test_job_id_key, job_id)
   end
 
   def test_job_status

app/models/event.rb

@@ -369,7 +369,7 @@ def geocoding_cache_lookup
     location = address
 
     begin
-      redis = Redis.new(url: TeSS::Config.redis_url)
+      redis = TeSS::Config.redis
       if redis.exists?(location)
         self.latitude, self.longitude = JSON.parse(redis.get(location))
         Rails.logger.info("Re-using: #{location}")
@@ -395,7 +395,7 @@ def geocoding_api_lookup
       self.latitude = result[:lat]
       self.longitude = result[:lon]
       begin
-        redis = Redis.new(url: TeSS::Config.redis_url)
+        redis = TeSS::Config.redis
         redis.set(location, [latitude, longitude].to_json)
       rescue Redis::BaseError => e
         raise e unless Rails.env.production?
@@ -418,7 +418,7 @@ def enqueue_geocoding_worker
     location = address
 
     begin
-      redis = Redis.new(url: TeSS::Config.redis_url)
+      redis = TeSS::Config.redis
       last_geocode = redis.get('last_geocode') || Time.now
 
       run_at = [last_geocode.to_i, Time.now.to_i].max + NOMINATIM_DELAY

app/workers/geocoding_worker.rb

@@ -18,7 +18,7 @@ def perform(arg_array)
       return
     end
 
-    redis = Redis.new(url: TeSS::Config.redis_url)
+    redis = TeSS::Config.redis
 
     if redis.exists?(location)
       event.geocoding_cache_lookup

config/application.rb

@@ -112,6 +112,11 @@ def self.merge_config(default_config, config, current_path = '')
   merge_config(Rails.configuration.tess_defaults.with_indifferent_access, tess_config)
 
   class TessConfig < OpenStruct
+
+    def redis
+      _redis || Redis.new(url: TeSS::Config.redis_url)
+    end
+
     def redis_url
       if Rails.env.test?
         ENV.fetch('REDIS_TEST_URL') { 'redis://localhost:6379/0' }

lib/fairsharing/client.rb

@@ -33,7 +33,7 @@ def get_token(username = nil, password = nil)
     end
 
     def token
-      redis = Redis.new(url: TeSS::Config.redis_url)
+      redis = TeSS::Config.redis
       expiry = redis.hget(REDIS_KEY, 'expiry')
       t = redis.hget(REDIS_KEY, 'token')
       if t && expiry && !Time.at(expiry.to_i).past?

test/integration/sitemap_test.rb

@@ -3,8 +3,10 @@
 class SitemapTest < ActionDispatch::IntegrationTest
   teardown do
     dir = Rails.root.join('public', 'test_sitemaps')
-    dir.glob('*.xml').each(&:delete)
-    dir.delete
+    if dir.exist?
+      dir.glob('*.xml').each(&:delete)
+      dir.delete
+    end
   end
 
   test 'generates sitemap' do

test/models/event_test.rb

@@ -321,8 +321,7 @@ class EventTest < ActiveSupport::TestCase
                                     venue: 'A place', city: 'Manchester',
                                     country: @event.country, postcode: @event.postcode })
     event = Event.new(parameters)
-    redis = Redis.new(url: TeSS::Config.redis_url)
-    redis.set(event.address, [45, 45].to_json)
+    TeSS::Config.redis.set(event.address, [45, 45].to_json)
 
     refute event.address.blank?
 

test/test_helper.rb

@@ -41,9 +41,14 @@
 class ActiveSupport::TestCase
   include SchemaHelper
 
+  parallelize(workers: :number_of_processors)
+
+  parallelize_setup do |worker|
+    TeSS::Config._redis = Redis.new(url: ENV.fetch('REDIS_TEST_URL') { "redis://localhost:6379/#{2 + worker}" })
+  end
+
   setup do
-    redis = Redis.new(url: TeSS::Config.redis_url)
-    redis.flushdb
+    TeSS::Config.redis.flushdb
   end
 
   teardown do

test/unit/fairsharing/client_test.rb

@@ -7,7 +7,6 @@ class ClientTest < ActiveSupport::TestCase
       @token_issue_date = Time.new(2022, 12, 1, 16, 7, 18)
       @token = 'eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiIyMjIxMDlhMi0wZWZkLTQ0Y2EtYTYzOC1jNjFmMWZmNmQxYjAiLCJzdWIiOiI4MjI0Iiwic2NwIjoidXNlciIsImF1ZCI6bnVsbCwiaWF0IjoxNjY5OTEwODM4LCJleHAiOjE2Njk5OTcyMzh9.Dv_E6JiyRSrvoOZMHZeQLiEbqYnsTR0qkyrKyWWqb80'
       @expiry = '1669997238'
-      @redis = Redis.new(url: TeSS::Config.redis_url)
     end
 
     test 'should get token' do
@@ -21,20 +20,20 @@ class ClientTest < ActiveSupport::TestCase
     end
 
     test 'should store token in redis' do
-      assert_nil @redis.hget(Fairsharing::Client::REDIS_KEY, 'expiry')
-      assert_nil @redis.hget(Fairsharing::Client::REDIS_KEY, 'token')
+      assert_nil TeSS::Config.redis.hget(Fairsharing::Client::REDIS_KEY, 'expiry')
+      assert_nil TeSS::Config.redis.hget(Fairsharing::Client::REDIS_KEY, 'token')
 
       VCR.use_cassette('fairsharing/get_token') do
         travel_to(@token_issue_date) do
           @client.token
         end
       end
 
-      assert_equal @expiry, @redis.hget(Fairsharing::Client::REDIS_KEY, 'expiry')
-      assert_equal @token, @redis.hget(Fairsharing::Client::REDIS_KEY, 'token')
+      assert_equal @expiry, TeSS::Config.redis.hget(Fairsharing::Client::REDIS_KEY, 'expiry')
+      assert_equal @token, TeSS::Config.redis.hget(Fairsharing::Client::REDIS_KEY, 'token')
     end
 
-    test 'should re-use token from @redis' do
+    test 'should re-use token from TeSS::Config.redis' do
       set_cached_token('abcdefg', 1_669_997_273)
 
       VCR.use_cassette('fairsharing/get_token') do
@@ -44,20 +43,20 @@ class ClientTest < ActiveSupport::TestCase
         end
       end
 
-      assert_equal '1669997273', @redis.hget(Fairsharing::Client::REDIS_KEY, 'expiry')
-      assert_equal 'abcdefg', @redis.hget(Fairsharing::Client::REDIS_KEY, 'token')
+      assert_equal '1669997273', TeSS::Config.redis.hget(Fairsharing::Client::REDIS_KEY, 'expiry')
+      assert_equal 'abcdefg', TeSS::Config.redis.hget(Fairsharing::Client::REDIS_KEY, 'token')
     end
 
-    test 'should not re-use token from @redis if expired' do
+    test 'should not re-use token from TeSS::Config.redis if expired' do
       set_cached_token('abcdefg', 3.days.ago.to_i)
 
       VCR.use_cassette('fairsharing/get_token') do
         token = @client.token
         assert_equal @token, token, 'Token should have been renewed'
       end
 
-      assert_equal @expiry, @redis.hget(Fairsharing::Client::REDIS_KEY, 'expiry')
-      assert_equal @token, @redis.hget(Fairsharing::Client::REDIS_KEY, 'token')
+      assert_equal @expiry, TeSS::Config.redis.hget(Fairsharing::Client::REDIS_KEY, 'expiry')
+      assert_equal @token, TeSS::Config.redis.hget(Fairsharing::Client::REDIS_KEY, 'token')
     end
 
     test 'can search' do
@@ -164,8 +163,8 @@ class ClientTest < ActiveSupport::TestCase
     private
 
     def set_cached_token(token = @token, expiry = @expiry)
-      @redis.hset(Fairsharing::Client::REDIS_KEY, 'token', token)
-      @redis.hset(Fairsharing::Client::REDIS_KEY, 'expiry', expiry)
+      TeSS::Config.redis.hset(Fairsharing::Client::REDIS_KEY, 'token', token)
+      TeSS::Config.redis.hset(Fairsharing::Client::REDIS_KEY, 'expiry', expiry)
     end
   end
 end

test/workers/geocoding_worker_test.rb

@@ -23,8 +23,7 @@ class GeocodingWorkerTest < ActiveSupport::TestCase
     assert_nil event.latitude
     assert_nil event.longitude
 
-    redis = Redis.new(url: TeSS::Config.redis_url)
-    redis.set(event.address, [45, 45].to_json)
+    TeSS::Config.redis.set(event.address, [45, 45].to_json)
 
     Sidekiq::Testing.inline! do
       GeocodingWorker.perform_async([event.id, event.address])