Skip to content

apt::setting: Dont expect source/content when removing settings #1208

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

Merged
merged 1 commit into from
Nov 21, 2024
Merged

apt::setting: Dont expect source/content when removing settings #1208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions manifests/setting.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@
fail('apt::setting cannot have both content and source')
}

if !$content and !$source {
fail('apt::setting needs either of content or source')
if $ensure != 'absent' {
if !$content and !$source {
fail('apt::setting needs either of content or source')
}
}

$title_array = split($title, '-')
Expand Down
9 changes: 8 additions & 1 deletion spec/defines/setting_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,16 @@
it { is_expected.to contain_file('/etc/apt/apt.conf.d/100teddybear').that_notifies('Class[Apt::Update]') }
end

describe 'with ensure=absent' do
describe 'with ensure=absent and default params' do
let(:params) { default_params.merge(ensure: 'absent') }

it {
expect(subject).to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Class[Apt::Update]').with(ensure: 'absent')
}
end
describe 'with ensure=absent and without default params' do
let(:params) { { ensure: 'absent' } }

it {
expect(subject).to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Class[Apt::Update]').with(ensure: 'absent')
}
Expand Down