Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

1 files changed, 0 insertions, 17 deletions

diff --git a/spec/lib/gitlab/database/load_balancing/sticking_spec.rb b/spec/lib/gitlab/database/load_balancing/sticking_spec.rb
index d88554614cf..f3139bb1b4f 100644
--- a/spec/lib/gitlab/database/load_balancing/sticking_spec.rb
+++ b/spec/lib/gitlab/database/load_balancing/sticking_spec.rb
@@ -256,15 +256,6 @@ RSpec.describe Gitlab::Database::LoadBalancing::Sticking, :redis do
 
       expect(sticking.last_write_location_for(:user, 4)).to be_nil
     end
-
-    it 'removes the old key' do
-      Gitlab::Redis::SharedState.with do |redis|
-        redis.set(sticking.send(:old_redis_key_for, :user, 4), 'foo', ex: 30)
-      end
-
-      sticking.unstick(:user, 4)
-      expect(sticking.last_write_location_for(:user, 4)).to be_nil
-    end
   end
 
   describe '#last_write_location_for' do
@@ -273,14 +264,6 @@ RSpec.describe Gitlab::Database::LoadBalancing::Sticking, :redis do
 
       expect(sticking.last_write_location_for(:user, 4)).to eq('foo')
     end
-
-    it 'falls back to reading the old key' do
-      Gitlab::Redis::SharedState.with do |redis|
-        redis.set(sticking.send(:old_redis_key_for, :user, 4), 'foo', ex: 30)
-      end
-
-      expect(sticking.last_write_location_for(:user, 4)).to eq('foo')
-    end
   end
 
   describe '#redis_key_for' do