Skip to content

Commit 62db30f

Browse files
committed
Use different method name, in case method is cached in specs
1 parent 7040b3d commit 62db30f

File tree

7 files changed

+24
-24
lines changed

7 files changed

+24
-24
lines changed

spec/mongo/server_selector/nearest_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@
8585
context 'tag sets provided' do
8686
let(:tag_sets) { [tag_set] }
8787
let(:matching_primary) do
88-
server(:primary, :tags => server_tags, address: default_address)
88+
make_server(:primary, :tags => server_tags, address: default_address)
8989
end
9090
let(:matching_secondary) do
91-
server(:secondary, :tags => server_tags, address: default_address)
91+
make_server(:secondary, :tags => server_tags, address: default_address)
9292
end
9393

9494
context 'single candidate' do
@@ -173,8 +173,8 @@
173173
end
174174

175175
context 'high latency servers' do
176-
let(:far_primary) { server(:primary, :average_round_trip_time => 113, address: default_address) }
177-
let(:far_secondary) { server(:secondary, :average_round_trip_time => 114, address: default_address) }
176+
let(:far_primary) { make_server(:primary, :average_round_trip_time => 113, address: default_address) }
177+
let(:far_secondary) { make_server(:secondary, :average_round_trip_time => 114, address: default_address) }
178178

179179
context 'single candidate' do
180180

spec/mongo/server_selector/primary_preferred_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@
8181
let(:tag_sets) { [tag_set] }
8282

8383
let(:matching_primary) do
84-
server(:primary, :tags => server_tags, address: default_address )
84+
make_server(:primary, :tags => server_tags, address: default_address )
8585
end
8686

8787
let(:matching_secondary) do
88-
server(:secondary, :tags => server_tags, address: default_address )
88+
make_server(:secondary, :tags => server_tags, address: default_address )
8989
end
9090

9191
context 'single candidate' do
@@ -171,8 +171,8 @@
171171
end
172172

173173
context 'high latency servers' do
174-
let(:far_primary) { server(:primary, :average_round_trip_time => 100, address: default_address) }
175-
let(:far_secondary) { server(:secondary, :average_round_trip_time => 113, address: default_address) }
174+
let(:far_primary) { make_server(:primary, :average_round_trip_time => 100, address: default_address) }
175+
let(:far_secondary) { make_server(:secondary, :average_round_trip_time => 113, address: default_address) }
176176

177177
context 'single candidate' do
178178

spec/mongo/server_selector/primary_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676
end
7777

7878
context 'high latency candidates' do
79-
let(:far_primary) { server(:primary, :average_round_trip_time => 100, address: default_address) }
80-
let(:far_secondary) { server(:secondary, :average_round_trip_time => 120, address: default_address) }
79+
let(:far_primary) { make_server(:primary, :average_round_trip_time => 100, address: default_address) }
80+
let(:far_secondary) { make_server(:secondary, :average_round_trip_time => 120, address: default_address) }
8181

8282
context 'single candidate' do
8383

spec/mongo/server_selector/secondary_preferred_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@
8787
end
8888

8989
let(:matching_primary) do
90-
server(:primary, :tags => server_tags, address: default_address)
90+
make_server(:primary, :tags => server_tags, address: default_address)
9191
end
9292

9393
let(:matching_secondary) do
94-
server(:secondary, :tags => server_tags, address: default_address)
94+
make_server(:secondary, :tags => server_tags, address: default_address)
9595
end
9696

9797
context 'single candidate' do
@@ -170,8 +170,8 @@
170170
end
171171

172172
context 'high latency servers' do
173-
let(:far_primary) { server(:primary, :average_round_trip_time => 100, address: default_address) }
174-
let(:far_secondary) { server(:secondary, :average_round_trip_time => 113, address: default_address) }
173+
let(:far_primary) { make_server(:primary, :average_round_trip_time => 100, address: default_address) }
174+
let(:far_secondary) { make_server(:secondary, :average_round_trip_time => 113, address: default_address) }
175175

176176
context 'single candidate' do
177177

spec/mongo/server_selector/secondary_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676

7777
context 'tag sets provided' do
7878
let(:tag_sets) { [tag_set] }
79-
let(:matching_secondary) { server(:secondary, :tags => server_tags, address: default_address) }
79+
let(:matching_secondary) { make_server(:secondary, :tags => server_tags, address: default_address) }
8080

8181
context 'single candidate' do
8282

@@ -134,8 +134,8 @@
134134
end
135135

136136
context 'high latency servers' do
137-
let(:far_primary) { server(:primary, :average_round_trip_time => 100, address: default_address) }
138-
let(:far_secondary) { server(:secondary, :average_round_trip_time => 113, address: default_address) }
137+
let(:far_primary) { make_server(:primary, :average_round_trip_time => 100, address: default_address) }
138+
let(:far_secondary) { make_server(:secondary, :average_round_trip_time => 113, address: default_address) }
139139

140140
context 'single candidate' do
141141

spec/mongo/server_selector_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
context 'when #select returns a list of nils' do
146146

147147
let(:servers) do
148-
[ server(:primary) ]
148+
[ make_server(:primary) ]
149149
end
150150

151151
let(:cluster) do
@@ -174,7 +174,7 @@
174174
context 'when the cluster has a server_selection_timeout set' do
175175

176176
let(:servers) do
177-
[ server(:secondary), server(:primary) ]
177+
[ make_server(:secondary), make_server(:primary) ]
178178
end
179179

180180
let(:cluster) do
@@ -201,14 +201,14 @@
201201
context 'when the cluster has a local_threshold set' do
202202

203203
let(:near_server) do
204-
server(:secondary).tap do |s|
204+
make_server(:secondary).tap do |s|
205205
allow(s).to receive(:connectable?).and_return(true)
206206
allow(s).to receive(:average_round_trip_time).and_return(100)
207207
end
208208
end
209209

210210
let(:far_server) do
211-
server(:secondary).tap do |s|
211+
make_server(:secondary).tap do |s|
212212
allow(s).to receive(:connectable?).and_return(true)
213213
allow(s).to receive(:average_round_trip_time).and_return(200)
214214
end

spec/support/shared/server_selector.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
def server(mode, options = {})
1+
def make_server(mode, options = {})
22
tags = options[:tags] || {}
33
average_round_trip_time = options[:average_round_trip_time] || 0
44

@@ -30,8 +30,8 @@ def server(mode, options = {})
3030
let(:server_tags) do
3131
{ 'test' => 'tag', 'other' => 'tag' }
3232
end
33-
let(:primary) { server(:primary) }
34-
let(:secondary) { server(:secondary) }
33+
let(:primary) { make_server(:primary) }
34+
let(:secondary) { make_server(:secondary) }
3535
let(:options) { { :mode => name, :tag_sets => tag_sets } }
3636
let(:selector) { described_class.new(options) }
3737

0 commit comments

Comments
 (0)