Skip to content

Commit

Permalink
m
Browse files Browse the repository at this point in the history
  • Loading branch information
lucywyman committed Mar 2, 2020
1 parent 885166a commit e500e06
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
3 changes: 1 addition & 2 deletions spec/integration/apply_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -430,8 +430,7 @@ def task_plugin_inventory
def config
{ 'modulepath' => File.join(__dir__, '../fixtures/apply'),
'winrm' => {
'ssl' => false,
'ssl-verify' => false,
'cacert' => File.join(__dir__, '../fixtures/ssl/ca.pem'),
'user' => conn_info('winrm')[:user],
'password' => conn_info('winrm')[:password]
} }
Expand Down
6 changes: 3 additions & 3 deletions spec/integration/winrm_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
let(:uri) { conn_uri('winrm') }
let(:password) { conn_info('winrm')[:password] }
let(:user) { conn_info('winrm')[:user] }
let(:cacert) { File.join(__dir__, '../fixtures/ssl/ca.pem') }

context 'when using CLI options' do
let(:config_flags) {
%W[--targets #{uri} --no-ssl --no-ssl-verify --format json --modulepath #{modulepath}
%W[--targets #{uri} --cacert #{cacert} --format json --modulepath #{modulepath}
--password #{password}]
}

Expand Down Expand Up @@ -93,8 +94,7 @@
'winrm' => {
'user' => user,
'password' => password,
'ssl' => false,
'ssl-verify' => false
'cacert' => cacert
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion spec/lib/bolt_spec/conn.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def conn_info(transport)
when 'ssh'
default_port = 20022
when 'winrm'
default_port = 25985
default_port = 25986
when 'docker'
default_user = ''
default_password = ''
Expand Down

0 comments on commit e500e06

Please sign in to comment.