diff --git a/Gemfile.lock b/Gemfile.lock index dbbf9eb09eb..b18689e9519 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -433,7 +433,7 @@ GEM activesupport (>= 3.1) shoulda-matchers (5.1.0) activesupport (>= 5.2.0) - sidekiq (6.4.1) + sidekiq (6.4.2) connection_pool (>= 2.2.2) rack (~> 2.0) redis (>= 4.2.0) diff --git a/spec/lib/backup_restore/system_interface_spec.rb b/spec/lib/backup_restore/system_interface_spec.rb index fe0740c3b4c..edc7405c3c4 100644 --- a/spec/lib/backup_restore/system_interface_spec.rb +++ b/spec/lib/backup_restore/system_interface_spec.rb @@ -107,12 +107,13 @@ describe BackupRestore::SystemInterface do end context "with Sidekiq workers" do - before { flush_sidekiq_redis_namespace } - after { flush_sidekiq_redis_namespace } + after do + flush_sidekiq_redis_namespace + end def flush_sidekiq_redis_namespace Sidekiq.redis do |redis| - redis.scan_each { |key| Discourse.redis.del(key) } + redis.scan_each { |key| redis.del(key) } end end @@ -144,7 +145,7 @@ describe BackupRestore::SystemInterface do run_at: Time.now.to_i, payload: Sidekiq.dump_json(payload) ) - conn.hmset("#{key}:workers", '444', data) + conn.hmset("#{key}:work", '444', data) end end