Commit 49c9effa authored by Tim Smith's avatar Tim Smith Committed by GitHub
Browse files

Merge pull request #65 from tas50/upstreammaster

Testing updates
parents 740b021e 9cd4d4a4
......@@ -6,6 +6,9 @@ driver:
# privileged is required otherwise the container doesn't boot right
privileged: true
verifier:
name: inspec
platforms:
- name: centos-6
driver:
......@@ -59,16 +62,11 @@ platforms:
- /usr/bin/apt-get install apt-transport-https net-tools -y
suites:
- name: default
run_list: ["recipe[ossec]"]
attributes: {}
- name: wui
driver_config:
network:
- ["private_network", {ip: "192.168.33.33"}]
- name: client
run_list:
- recipe[ossec::client]
data_bags_path: 'test/fixtures/data_bags'
- name: server
run_list:
- "recipe[ossec::server]"
- "recipe[ossec::wui]"
attributes:
dev_mode: true
data_bags_path: 'test/integration/default/data_bags'
- recipe[ossec::server]
data_bags_path: 'test/fixtures/data_bags'
......@@ -4,6 +4,9 @@ driver:
provisioner:
name: chef_zero
verifier:
name: inspec
platforms:
- name: centos-5.11
- name: centos-6.7
......@@ -22,13 +25,11 @@ platforms:
run_list: apt::default
suites:
- name: default
run_list:
- recipe[ossec]
- name: client
run_list:
- recipe[ossec::client]
data_bags_path: 'test/fixtures/data_bags'
- name: server
run_list:
- recipe[ossec::server]
data_bags_path: 'test/integration/default/data_bags'
data_bags_path: 'test/fixtures/data_bags'
......@@ -17,3 +17,7 @@ end
group :kitchen_vagrant do
gem 'kitchen-vagrant', '~> 0.19'
end
group :kitchen_inspec do
gem 'kitchen-inspec'
end
......@@ -2,7 +2,7 @@ require 'spec_helper'
require 'json'
describe 'ossec::agent' do
let(:data_bags_path) { File.expand_path('../../../../test/integration/default/data_bags', __FILE__) }
let(:data_bags_path) { File.expand_path('../../../../test/fixtures/data_bags', __FILE__) }
let(:data_bag_ossec_ssh) { JSON.parse(File.read("#{data_bags_path}/ossec/ssh.json")) }
cached(:chef_run) do
......
......@@ -2,7 +2,7 @@ require 'spec_helper'
require 'json'
describe 'ossec::client' do
let(:data_bags_path) { File.expand_path('../../../../test/integration/default/data_bags', __FILE__) }
let(:data_bags_path) { File.expand_path('../../../../test/fixtures/data_bags', __FILE__) }
let(:data_bag_ossec_ssh) { JSON.parse(File.read("#{data_bags_path}/ossec/ssh.json")) }
cached(:chef_run) do
......
......@@ -2,7 +2,7 @@ require 'spec_helper'
require 'json'
describe 'ossec::server' do
let(:data_bags_path) { File.expand_path('../../../../test/integration/default/data_bags', __FILE__) }
let(:data_bags_path) { File.expand_path('../../../../test/fixtures/data_bags', __FILE__) }
let(:data_bag_ossec_ssh) { JSON.parse(File.read("#{data_bags_path}/ossec/ssh.json")) }
cached(:chef_run) do
......
service_name = case os[:family]
when 'ubuntu', 'debian'
'ossec'
else
'ossec-hids'
end
describe service(service_name) do
it { should be_enabled }
# it { should be_running } # can't be enabled due to status command returning 1
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