Skip to content

Commit bc3b0fc

Browse files
committed
RUBY-1222 use default address's resolver for ssl socket test
1 parent e0d4e78 commit bc3b0fc

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

spec/mongo/socket/ssl_spec.rb

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,24 @@
22

33
describe Mongo::Socket::SSL, if: running_ssl? do
44

5-
let(:family) do
6-
resolver = default_address.instance_variable_get(:@resolver)
7-
Mongo::Address::FAMILY_MAP.key(resolver.class)
5+
let(:address) do
6+
default_address
7+
end
8+
9+
let(:resolver) do
10+
address.instance_variable_get(:@resolver)
11+
end
12+
13+
let(:socket_timeout) do
14+
1
815
end
916

1017
let(:socket) do
11-
described_class.new(*default_address.to_s.split(":"), default_address.host, 5, family, options)
18+
resolver.socket(socket_timeout, options)
1219
end
1320

1421
let(:options) do
15-
{
16-
:ssl => true,
17-
:ssl_cert => CLIENT_CERT_PEM,
18-
:ssl_key => CLIENT_KEY_PEM,
19-
:ssl_verify => false
20-
}
22+
SSL_OPTIONS
2123
end
2224

2325
let (:key_string) do

spec/support/authorization.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@
8080
write: WRITE_CONCERN,
8181
heartbeat_frequency: 20,
8282
max_read_retries: 5,
83-
wait_queue_timeout: 2
83+
wait_queue_timeout: 2,
84+
connect_timeout: 3
8485
}
8586

8687
# Options for test suite clients.

0 commit comments

Comments
 (0)