Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test cleanup & fixup #62

Merged
merged 3 commits into from May 26, 2017
Merged

Test cleanup & fixup #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63529ee
Removing all uninstall tests
therobot May 26, 2017
b947e9c
Fixing unit tests
therobot May 26, 2017
9895a03
Removing uninstall tests
therobot May 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion spec/unit/recipes/authoritative_debian_spec.rb
View file
Open in desktop
@@ -1,6 +1,6 @@
require 'spec_helper'

describe 'pdns_test::authoritative_install_single_bind' do
describe 'pdns_test::authoritative_install_multi' do
context 'on ubuntu platform' do
let(:ubuntu_runner) do
ChefSpec::SoloRunner.new(
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/recipes/authoritative_rhel_spec.rb
View file
Open in desktop
@@ -1,6 +1,6 @@
require 'spec_helper'

describe 'pdns_test::authoritative_install_single_bind' do
describe 'pdns_test::authoritative_install_multi' do
context 'on rhel platform' do
let(:rhel_runner) do
ChefSpec::SoloRunner.new(
Expand Down
14 changes: 7 additions & 7 deletions spec/unit/recipes/recursor_debian_spec.rb
View file
Open in desktop
@@ -1,6 +1,6 @@
require 'spec_helper'

describe 'pdns_test::recursor_install_single' do
describe 'pdns_test::recursor_install_multi' do
context 'on ubuntu platform' do
let(:ubuntu_runner) do
ChefSpec::SoloRunner.new(
Expand Down Expand Up @@ -36,12 +36,12 @@
#

it 'creates a specific init script' do
expect(chef_run).to create_template('/etc/init.d/a_pdns_recursor')
expect(chef_run).to create_template('/etc/init.d/server-01')
end

it 'enables and starts pdns_recursor service' do
expect(chef_run).to enable_service('pdns-recursor').with(pattern: 'pdns_recursor')
expect(chef_run).to start_service('pdns-recursor').with(pattern: 'pdns_recursor')
expect(chef_run).to enable_service('pdns-recursor-server-01').with(pattern: 'pdns_recursor')
expect(chef_run).to start_service('pdns-recursor-server-01').with(pattern: 'pdns_recursor')
end

#
Expand All @@ -64,16 +64,16 @@
end

it 'creates a pdns recursor socket directory' do
expect(chef_run).to create_directory('/var/run/a_pdns_recursor')
expect(chef_run).to create_directory('/var/run/server-01')
end

it 'creates a recursor.d config directory' do
expect(chef_run).to create_directory('/etc/powerdns/recursor.d/a_pdns_recursor')
expect(chef_run).to create_directory('/etc/powerdns/recursor.d/server-01')
.with(owner: 'root', group: 'root', mode: '0755')
end

it 'creates a recursor instance config' do
expect(chef_run).to create_template('/etc/powerdns/recursor.d/a_pdns_recursor/recursor.conf')
expect(chef_run).to create_template('/etc/powerdns/recursor.d/server-01/recursor.conf')
.with(owner: 'root', group: 'root', mode: '0640')
end

Expand Down
14 changes: 7 additions & 7 deletions spec/unit/recipes/recursor_rhel_spec.rb
View file
Open in desktop
@@ -1,6 +1,6 @@
require 'spec_helper'

describe 'pdns_test::recursor_install_single' do
describe 'pdns_test::recursor_install_multi' do
context 'on rhel platform' do
let(:rhel_runner) do
ChefSpec::SoloRunner.new(
Expand Down Expand Up @@ -39,12 +39,12 @@
#

it 'creates a specific init script' do
expect(chef_run).to create_template('/etc/init.d/a_pdns_recursor')
expect(chef_run).to create_template('/etc/init.d/server-01')
end

it 'enables and starts pdns_recursor service' do
expect(chef_run).to enable_service('pdns-recursor').with(pattern: 'pdns_recursor')
expect(chef_run).to start_service('pdns-recursor').with(pattern: 'pdns_recursor')
expect(chef_run).to enable_service('pdns-recursor-server-01').with(pattern: 'pdns_recursor')
expect(chef_run).to start_service('pdns-recursor-server-01').with(pattern: 'pdns_recursor')
end

#
Expand All @@ -67,16 +67,16 @@
end

it 'creates a pdns recursor socket directory' do
expect(chef_run).to create_directory('/var/run/a_pdns_recursor')
expect(chef_run).to create_directory('/var/run/server-01')
end

it 'creates a recursor.d config directory' do
expect(chef_run).to create_directory('/etc/powerdns-recursor/recursor.d/a_pdns_recursor')
expect(chef_run).to create_directory('/etc/powerdns-recursor/recursor.d/server-01')
.with(owner: 'root', group: 'root', mode: '0755')
end

it 'creates a recursor instance config' do
expect(chef_run).to create_template('/etc/powerdns-recursor/recursor.d/a_pdns_recursor/recursor.conf')
expect(chef_run).to create_template('/etc/powerdns-recursor/recursor.d/server-01/recursor.conf')
.with(owner: 'root', group: 'root', mode: '0640')
end

Expand Down
23 changes: 0 additions & 23 deletions spec/unit/recipes/recursor_uninstall_debian_spec.rb
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions spec/unit/recipes/recursor_uninstall_rhel_spec.rb
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions test/cookbooks/pdns_test/recipes/authoritative_install_multi.rb
View file
Open in desktop
Expand Up @@ -55,9 +55,9 @@
end

pdns_authoritative_service 'server-01' do
action :restart
action :start
end

pdns_authoritative_service 'server-02' do
action :restart
action :start
end
3 changes: 0 additions & 3 deletions test/cookbooks/pdns_test/recipes/authoritative_remove.rb
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions test/cookbooks/pdns_test/recipes/recursor_remove.rb
View file
Open in desktop

This file was deleted.