Commit 65a03077 authored by Tim Smith's avatar Tim Smith
Browse files

Rubocop linting fixes

parent ad6f4cee
......@@ -33,29 +33,29 @@ namespace :integration do
instance.test(:always)
end
end
desc 'Run Test Kitchen with cloud plugins'
task :cloud do
run_kitchen = true
if ENV['TRAVIS'] == 'true' && ENV['TRAVIS_PULL_REQUEST'] != 'false'
run_kitchen = false
end
if run_kitchen
Kitchen.logger = Kitchen.default_file_logger
@loader = Kitchen::Loader::YAML.new(project_config: './.kitchen.cloud.yml')
config = Kitchen::Config.new( loader: @loader)
config = Kitchen::Config.new(loader: @loader)
config.instances.each do |instance|
instance.test(:always)
end
instance.test(:always)
end
end
end
end
desc 'Run all tests on Travis'
#task travis: ['style', 'spec', 'integration:cloud']
# task travis: ['style', 'spec', 'integration:cloud']
task travis: ['style', 'integration:cloud']
# Default
#task default: ['style', 'spec', 'integration:vagrant']
# task default: ['style', 'spec', 'integration:vagrant']
task default: ['style', 'integration:vagrant']
......@@ -40,5 +40,5 @@ end
file "#{node['rsyslog']['config_prefix']}/rsyslog.d/remote.conf" do
action :delete
notifies :reload, "service[#{node['rsyslog']['service_name']}]"
only_if { ::File.exists?("#{node['rsyslog']['config_prefix']}/rsyslog.d/remote.conf") }
only_if { ::File.exist?("#{node['rsyslog']['config_prefix']}/rsyslog.d/remote.conf") }
end
......@@ -86,7 +86,7 @@ describe 'rsyslog::server' do
let(:file) { chef_run.file('/etc/rsyslog.d/remote.conf') }
it 'deletes the file' do
pending "Stubbing class methods without breaking everything is hard"
pending 'Stubbing class methods without breaking everything is hard'
expect(chef_run).to delete_file(file.path)
end
......@@ -104,7 +104,7 @@ describe 'rsyslog::server' do
let(:file) { chef_run.file('/opt/local/etc/rsyslog.d/remote.conf') }
it 'deletes the file' do
pending "Stubbing class methods without breaking everything is hard"
pending 'Stubbing class methods without breaking everything is hard'
expect(chef_run).to delete_file(file.path)
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment