Merge branch 'master' of github.com:inspec/inspec

This commit is contained in:
Clinton Wolfe 2019-04-11 10:19:15 -04:00
commit e87b71d2f1
4 changed files with 10 additions and 8 deletions

View file

@ -1,16 +1,17 @@
# Change Log
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
<!-- latest_release 4.0.4 -->
## [v4.0.4](https://github.com/inspec/inspec/tree/v4.0.4) (2019-04-09)
<!-- latest_release unreleased -->
## Unreleased
#### Merged Pull Requests
- Attribute-&gt;Input Rename: Rename cli option [#3879](https://github.com/inspec/inspec/pull/3879) ([clintoncwolfe](https://github.com/clintoncwolfe))
- Fix winrm no-such-transport test [#3927](https://github.com/inspec/inspec/pull/3927) ([clintoncwolfe](https://github.com/clintoncwolfe))
<!-- latest_release -->
<!-- release_rollup since=3.9.0 -->
### Changes since 3.9.0 release
#### Merged Pull Requests
- Fix winrm no-such-transport test [#3927](https://github.com/inspec/inspec/pull/3927) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 4.0.4 -->
- Attribute-&gt;Input Rename: Rename cli option [#3879](https://github.com/inspec/inspec/pull/3879) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 4.0.4 -->
- Remove EOL Ubuntu / macOS platform testing [#3910](https://github.com/inspec/inspec/pull/3910) ([tas50](https://github.com/tas50)) <!-- 4.0.3 -->
- apt: correct docs to clarify that it matches repositories not packages [#3915](https://github.com/inspec/inspec/pull/3915) ([nqb](https://github.com/nqb)) <!-- 3.9.2 -->
@ -27,6 +28,7 @@
## [v3.9.2](https://github.com/inspec/inspec/tree/v3.9.2) (2019-04-08)
#### Merged Pull Requests
- Fix winrm no-such-transport test [#3927](https://github.com/inspec/inspec/pull/3927) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 4.0.4 -->
- Attribute-&gt;Input Rename: Rename cli option [#3879](https://github.com/inspec/inspec/pull/3879) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 4.0.4 -->
- Remove EOL Ubuntu / macOS platform testing [#3910](https://github.com/inspec/inspec/pull/3910) ([tas50](https://github.com/tas50)) <!-- 4.0.3 -->
- apt: correct docs to clarify that it matches repositories not packages [#3915](https://github.com/inspec/inspec/pull/3915) ([nqb](https://github.com/nqb))

View file

@ -76,7 +76,7 @@ namespace :test do
'test/functional/**/*_test.rb',
'lib/plugins/inspec-*/test/functional/**/*_test.rb',
])
t.warning = true
t.warning = false
t.verbose = true
t.ruby_opts = ['--dev'] if defined?(JRUBY_VERSION)
end
@ -93,7 +93,7 @@ namespace :test do
t.libs << 'test'
t.test_files = files
t.warning = true
t.warning = false
t.verbose = true
t.ruby_opts = ['--dev'] if defined?(JRUBY_VERSION)
end

View file

@ -1,3 +1,3 @@
module Inspec
VERSION = '4.0.4'
VERSION = '4.0.4'.freeze
end

View file

@ -416,9 +416,9 @@ Test Summary: \e[38;5;41m2 successful\e[0m, 0 failures, 0 skipped\n"
describe 'when --winrm-transport is used' do
it 'raises an exception when an invalid transport is given' do
out = inspec('exec ' + example_profile + ' -t winrm://administrator@dummy --password dummy --winrm-transport kerberos')
out = inspec('exec ' + example_profile + ' -t winrm://administrator@dummy --password dummy --winrm-transport nonesuch')
out.exit_status.must_equal 1
out.stderr.must_include "Client error, can't connect to 'winrm' backend: Unsupported transport type: :kerberos\n"
out.stderr.must_include "Client error, can't connect to 'winrm' backend: Unsupported transport type: :nonesuch\n"
end
end