Skip to content
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
2 changes: 1 addition & 1 deletion .evergreen/functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ prepare_server_from_url() {

install_mlaunch() {
pythonpath="$MONGO_ORCHESTRATION_HOME"/python
pip install -t "$pythonpath" 'mtools[mlaunch]'
pip install -t "$pythonpath" -v 'mtools[mlaunch]==1.5.3'
export PATH="$pythonpath/bin":$PATH
export PYTHONPATH="$pythonpath"
}
10 changes: 5 additions & 5 deletions spec/integration/client_authentication_options_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
end
end

shared_examples_for 'auth mechanism that uses database or default auth source' do |default_auth_source:|
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would do |default_auth_source: nil| fix this also?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was going to try that next. Let's see!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried that out, and rspec seems to think that I'm not passing in any value for default_auth_source. I know that keyword arguments are changing in Ruby 2.7/3, but I believe the existing syntax should still work, so I'm not sure how that's related.

How would you feel about just removing the keyword argument for now?

shared_examples_for 'auth mechanism that uses database or default auth source' do |default_auth_source|
context 'where no database is provided' do
context 'with URI options' do
let(:credentials) { "#{user}:#{pwd}@" }
Expand Down Expand Up @@ -198,7 +198,7 @@
let(:auth_mech_sym) { :mongodb_cr }

it_behaves_like 'a supported auth mechanism'
it_behaves_like 'auth mechanism that uses database or default auth source', default_auth_source: 'admin'
it_behaves_like 'auth mechanism that uses database or default auth source', 'admin'
it_behaves_like 'an auth mechanism that doesn\'t support auth_mech_properties'
end

Expand All @@ -207,7 +207,7 @@
let(:auth_mech_sym) { :scram }

it_behaves_like 'a supported auth mechanism'
it_behaves_like 'auth mechanism that uses database or default auth source', default_auth_source: 'admin'
it_behaves_like 'auth mechanism that uses database or default auth source', 'admin'
it_behaves_like 'an auth mechanism that doesn\'t support auth_mech_properties'
end

Expand All @@ -216,7 +216,7 @@
let(:auth_mech_sym) { :scram256 }

it_behaves_like 'a supported auth mechanism'
it_behaves_like 'auth mechanism that uses database or default auth source', default_auth_source: 'admin'
it_behaves_like 'auth mechanism that uses database or default auth source', 'admin'
it_behaves_like 'an auth mechanism that doesn\'t support auth_mech_properties'
end

Expand Down Expand Up @@ -263,7 +263,7 @@
let(:auth_mech_sym) { :plain }

it_behaves_like 'a supported auth mechanism'
it_behaves_like 'auth mechanism that uses database or default auth source', default_auth_source: '$external'
it_behaves_like 'auth mechanism that uses database or default auth source', '$external'
it_behaves_like 'an auth mechanism with ssl'
it_behaves_like 'an auth mechanism that doesn\'t support auth_mech_properties'
end
Expand Down