Skip to content

Updates for ssl testing #612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 28, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions spec/mongo/client_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

describe Mongo::Client do

before do
if running_ssl?
allow_any_instance_of(Mongo::Server::Monitor).to receive(:ismaster) do
[{}, 1]
end
end
end

describe '#==' do

let(:client) do
Expand Down
8 changes: 4 additions & 4 deletions spec/mongo/cluster/topology/replica_set_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
describe '#servers' do

let(:mongos) do
Mongo::Server.new(address, Mongo::Event::Listeners.new)
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
end

let(:standalone) do
Mongo::Server.new(address, Mongo::Event::Listeners.new)
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
end

let(:replica_set) do
Mongo::Server.new(address, Mongo::Event::Listeners.new)
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
end

let(:replica_set_two) do
Mongo::Server.new(address, Mongo::Event::Listeners.new)
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
end

let(:mongos_description) do
Expand Down
6 changes: 3 additions & 3 deletions spec/mongo/cluster/topology/sharded_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
describe '.servers' do

let(:mongos) do
Mongo::Server.new(address, Mongo::Event::Listeners.new)
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
end

let(:standalone) do
Mongo::Server.new(address, Mongo::Event::Listeners.new)
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
end

let(:replica_set) do
Mongo::Server.new(address, Mongo::Event::Listeners.new)
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
end

let(:mongos_description) do
Expand Down
8 changes: 4 additions & 4 deletions spec/mongo/cluster/topology/single_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@
describe '.servers' do

let(:mongos) do
Mongo::Server.new(address, Mongo::Event::Listeners.new)
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
end

let(:standalone) do
Mongo::Server.new(address, Mongo::Event::Listeners.new)
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
end

let(:standalone_two) do
Mongo::Server.new(address, Mongo::Event::Listeners.new)
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
end

let(:replica_set) do
Mongo::Server.new(address, Mongo::Event::Listeners.new)
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
end

let(:mongos_description) do
Expand Down
11 changes: 3 additions & 8 deletions spec/mongo/cluster_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
described_class.new(ADDRESSES, TEST_OPTIONS)
end


describe '#==' do

context 'when the other is a cluster' do
Expand Down Expand Up @@ -39,7 +38,7 @@
context 'when the addresses are not the same' do

let(:other) do
described_class.new([ '127.0.0.1:27018' ])
described_class.new([ '127.0.0.1:27018' ], TEST_OPTIONS)
end

it 'returns false' do
Expand Down Expand Up @@ -74,14 +73,10 @@
Mongo::ServerSelector.get
end

let(:cluster) do
described_class.new(ADDRESSES, :replica_set => 'testing')
end

context 'when the option is provided' do

let(:cluster) do
described_class.new(ADDRESSES, TEST_OPTIONS.merge(:replica_set => 'testing'))
described_class.new([ '127.0.0.1:27017' ], TEST_OPTIONS.merge(:replica_set => 'testing'))
end

it 'returns the name' do
Expand All @@ -92,7 +87,7 @@
context 'when the option is not provided' do

let(:cluster) do
described_class.new(ADDRESSES, TEST_OPTIONS)
described_class.new([ '127.0.0.1:27017' ], TEST_OPTIONS)
end

it 'returns nil' do
Expand Down
8 changes: 4 additions & 4 deletions spec/mongo/server/connection_pool_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
describe '#checkin' do

let(:server) do
Mongo::Server.new(address, Mongo::Event::Listeners.new)
Mongo::Server.new(address, Mongo::Event::Listeners.new, ssl: SSL)
end

let(:pool) do
Expand Down Expand Up @@ -39,7 +39,7 @@
describe '#checkout' do

let(:server) do
Mongo::Server.new(address, Mongo::Event::Listeners.new)
Mongo::Server.new(address, Mongo::Event::Listeners.new, ssl: SSL)
end

let(:pool) do
Expand Down Expand Up @@ -87,7 +87,7 @@
describe '.get' do

let(:server) do
Mongo::Server.new(address, Mongo::Event::Listeners.new)
Mongo::Server.new(address, Mongo::Event::Listeners.new, ssl: SSL)
end

let(:pool) do
Expand All @@ -102,7 +102,7 @@
describe '#inspect' do

let(:server) do
Mongo::Server.new(address, Mongo::Event::Listeners.new)
Mongo::Server.new(address, Mongo::Event::Listeners.new, ssl: SSL)
end

let(:pool) do
Expand Down
2 changes: 1 addition & 1 deletion spec/mongo/server/connection_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
end

let(:server) do
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
Mongo::Server.new(address, Mongo::Event::Listeners.new, ssl: SSL)
end

describe '#connect!' do
Expand Down
3 changes: 2 additions & 1 deletion spec/mongo/server_selection_rtt_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ def average_round_trip_time(start)
end

let(:monitor) do
Mongo::Server::Monitor.new(address, Mongo::Event::Listeners.new, avg_rtt_ms: spec.avg_rtt_ms)
Mongo::Server::Monitor.new(address, Mongo::Event::Listeners.new,
TEST_OPTIONS.merge(avg_rtt_ms: spec.avg_rtt_ms))
end

before do
Expand Down
4 changes: 2 additions & 2 deletions spec/mongo/server_selection_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
let(:candidate_servers) do
spec.candidate_servers.collect do |server|
address = Mongo::Address.new(server['address'])
Mongo::Server.new(address, Mongo::Event::Listeners.new).tap do |s|
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS).tap do |s|
allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'])
allow(s).to receive(:tags).and_return(server['tags'])
allow(s).to receive(:secondary?).and_return(server['type'] == 'RSSecondary')
Expand All @@ -43,7 +43,7 @@
let(:in_latency_window) do
spec.in_latency_window.collect do |server|
address = Mongo::Address.new(server['address'])
Mongo::Server.new(address, Mongo::Event::Listeners.new).tap do |s|
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS).tap do |s|
allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'])
allow(s).to receive(:tags).and_return(server['tags'])
end
Expand Down
2 changes: 1 addition & 1 deletion spec/mongo/server_selector/nearest_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
end
end

context 'mtuliple candidates' do
context 'multiple candidates' do

context 'no matching servers' do
let(:candidates) { [primary, secondary, secondary] }
Expand Down
18 changes: 9 additions & 9 deletions spec/mongo/server_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
describe '#==' do

let(:server) do
described_class.new(address, listeners)
described_class.new(address, listeners, TEST_OPTIONS)
end

context 'when the other is not a server' do
Expand All @@ -32,7 +32,7 @@
context 'when the addresses match' do

let(:other) do
described_class.new(address, listeners)
described_class.new(address, listeners, TEST_OPTIONS)
end

it 'returns true' do
Expand All @@ -47,7 +47,7 @@
end

let(:other) do
described_class.new(other_address, listeners)
described_class.new(other_address, listeners, TEST_OPTIONS)
end

it 'returns false' do
Expand All @@ -60,7 +60,7 @@
describe '#context' do

let(:server) do
described_class.new(address, listeners)
described_class.new(address, listeners, TEST_OPTIONS)
end

let(:context) do
Expand All @@ -75,7 +75,7 @@
describe '#disconnect!' do

let(:server) do
described_class.new(address, listeners)
described_class.new(address, listeners, TEST_OPTIONS)
end

it 'stops the monitor instance' do
Expand All @@ -87,7 +87,7 @@
describe '#initialize' do

let(:server) do
described_class.new(address, listeners, :heartbeat_frequency => 5)
described_class.new(address, listeners, TEST_OPTIONS.merge(:heartbeat_frequency => 5))
end

it 'sets the address host' do
Expand All @@ -99,14 +99,14 @@
end

it 'sets the options' do
expect(server.options).to eq(:heartbeat_frequency => 5)
expect(server.options).to eq(TEST_OPTIONS.merge(:heartbeat_frequency => 5))
end
end

describe '#pool' do

let(:server) do
described_class.new(address, listeners)
described_class.new(address, listeners, TEST_OPTIONS)
end

let(:pool) do
Expand All @@ -121,7 +121,7 @@
describe '#scan!' do

let(:server) do
described_class.new(address, listeners)
described_class.new(address, listeners, TEST_OPTIONS)
end

it 'forces a scan on the monitor' do
Expand Down
2 changes: 1 addition & 1 deletion spec/support/shared/server_selector.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def server(mode, options = {})
listeners = Mongo::Event::Listeners.new
address = Mongo::Address.new('127.0.0.1:27017')

server = Mongo::Server.new(address, listeners)
server = Mongo::Server.new(address, listeners, TEST_OPTIONS)
description = Mongo::Server::Description.new(address, ismaster, average_round_trip_time)
server.tap do |s|
allow(s).to receive(:description).and_return(description)
Expand Down