Skip to content

Commit

Permalink
Repair failing unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
hartmantis committed Jan 13, 2016
1 parent d3f1f30 commit 130ae23
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
1 change: 0 additions & 1 deletion .kitchen.circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@ platforms:
- name: debian-6
- name: centos-7
- name: centos-6
- name: fedora-23
- name: fedora-22
2 changes: 0 additions & 2 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ platforms:
- name: debian-6.0.10
- name: centos-7.2
- name: centos-6.7
- name: fedora-23
- name: fedora-22
- name: macosx-10.10
driver:
Expand Down Expand Up @@ -53,7 +52,6 @@ suites:
- centos-7
- centos-6.7
- centos-6
- fedora-23
- fedora-22
- macosx-10.10
- macosx
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ group :test do
gem 'kitchen-localhost'
gem 'kitchen-vagrant'
gem 'winrm-transport'
gem 'kitchen-docker'
end

group :integration do
Expand Down
4 changes: 2 additions & 2 deletions spec/libraries/provider_chef_dk_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -518,12 +518,12 @@
end

context 'Windows' do
let(:platform) { { platform: 'windows', version: '2012' } }
let(:platform) { { platform: 'windows', version: '2012R2' } }

it 'returns the correct params hash' do
expected = {
platform: 'windows',
platform_version: '6.2.9200',
platform_version: '6.3.9600',
machine_arch: 'x86_64',
version: nil,
prerelease: nil,
Expand Down
2 changes: 1 addition & 1 deletion spec/libraries/resource_chef_dk_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
},
{
platform: 'windows',
version: '2012',
version: '2012R2',
expected: Chef::Provider::ChefDk::Windows
}
].each do |p|
Expand Down
14 changes: 8 additions & 6 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,14 @@
c.after(:suite) { FileUtils.rm_r(COOKBOOK_PATH) }
end

SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
Coveralls::SimpleCov::Formatter,
SimpleCov::Formatter::HTMLFormatter,
SimpleCov::Formatter::Console
]
SimpleCov.minimum_coverage 90
SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
[
Coveralls::SimpleCov::Formatter,
SimpleCov::Formatter::HTMLFormatter,
SimpleCov::Formatter::Console
]
)
SimpleCov.minimum_coverage(100)
SimpleCov.start

at_exit { ChefSpec::Coverage.report! }

0 comments on commit 130ae23

Please sign in to comment.