name: 'Ubuntu',
release: {
major: '18',
- full: '18.04',
+ full: '18.04'
},
distro: {
codename: 'trusty',
- id: 'Ubuntu',
- },
+ id: 'Ubuntu'
+ }
},
puppet_vardir: '/opt/puppetlabs/puppet/cache'
}
let(:title) { 'ppa:needs/substitution' }
it { is_expected.not_to contain_package('python-software-properties') }
+
it {
- is_expected.to contain_exec('add-apt-repository-ppa:needs/substitution')
+ expect(subject).to contain_exec('add-apt-repository-ppa:needs/substitution')
.that_notifies('Class[Apt::Update]')
.with(*ppa_exec_params('needs', 'substitution'))
}
name: 'Ubuntu',
release: {
major: '18',
- full: '18.04',
+ full: '18.04'
},
distro: {
codename: 'trusty',
- id: 'Ubuntu',
- },
- },
+ id: 'Ubuntu'
+ }
+ }
}
end
name: 'Ubuntu',
release: {
major: '18',
- full: '18.04',
+ full: '18.04'
},
distro: {
codename: 'trusty',
- id: 'Ubuntu',
- },
- },
+ id: 'Ubuntu'
+ }
+ }
}
end
name: 'Ubuntu',
release: {
major: '15',
- full: '15.10',
+ full: '15.10'
},
distro: {
codename: 'wily',
- id: 'Ubuntu',
- },
+ id: 'Ubuntu'
+ }
},
- puppet_vardir: '/opt/puppetlabs/puppet/cache',
+ puppet_vardir: '/opt/puppetlabs/puppet/cache'
}
end
let(:title) { 'ppa:user/foo' }
it {
- is_expected.to contain_exec('add-apt-repository-ppa:user/foo')
+ expect(subject).to contain_exec('add-apt-repository-ppa:user/foo')
.that_notifies('Class[Apt::Update]')
.with(*ppa_exec_params('user', 'foo', 'wily'))
}
let :params do
{
package_name: 'software-properties-common',
- package_manage: true,
+ package_manage: true
}
end
name: 'Ubuntu',
release: {
major: '18',
- full: '18.04',
+ full: '18.04'
},
distro: {
codename: 'trusty',
- id: 'Ubuntu',
- },
+ id: 'Ubuntu'
+ }
},
- puppet_vardir: '/opt/puppetlabs/puppet/cache',
+ puppet_vardir: '/opt/puppetlabs/puppet/cache'
}
end
let(:title) { 'ppa:needs/substitution' }
it { is_expected.to contain_package('software-properties-common') }
+
it {
- is_expected.to contain_exec('add-apt-repository-ppa:needs/substitution')
+ expect(subject).to contain_exec('add-apt-repository-ppa:needs/substitution')
.that_notifies('Class[Apt::Update]')
.with(*ppa_exec_params('needs', 'substitution'))
}
name: 'Ubuntu',
release: {
major: '18',
- full: '18.04',
+ full: '18.04'
},
distro: {
codename: 'trusty',
- id: 'Ubuntu',
- },
+ id: 'Ubuntu'
+ }
},
- puppet_vardir: '/opt/puppetlabs/puppet/cache',
+ puppet_vardir: '/opt/puppetlabs/puppet/cache'
}
end
let :params do
{
- package_manage: false,
+ package_manage: false
}
end
let(:title) { 'ppa:needs/substitution' }
it { is_expected.not_to contain_package('python-software-properties') }
+
it {
- is_expected.to contain_exec('add-apt-repository-ppa:needs/substitution')
+ expect(subject).to contain_exec('add-apt-repository-ppa:needs/substitution')
.that_notifies('Class[Apt::Update]')
.with(*ppa_exec_params('needs', 'substitution'))
}
name: 'Ubuntu',
release: {
major: '18',
- full: '18.04',
+ full: '18.04'
},
distro: {
codename: 'trusty',
- id: 'Ubuntu',
- },
+ id: 'Ubuntu'
+ }
},
- puppet_vardir: '/opt/puppetlabs/puppet/cache',
+ puppet_vardir: '/opt/puppetlabs/puppet/cache'
}
end
let :params do
{
package_manage: true,
- require: 'Apt::Ppa[ppa:user/foo2]',
+ require: 'Apt::Ppa[ppa:user/foo2]'
}
end
it { is_expected.to compile.with_all_deps }
it { is_expected.to contain_package('software-properties-common') }
+
it {
- is_expected.to contain_exec('add-apt-repository-ppa:user/foo')
+ expect(subject).to contain_exec('add-apt-repository-ppa:user/foo')
.that_notifies('Class[Apt::Update]')
.with(*ppa_exec_params('user', 'foo'))
}
name: 'Ubuntu',
release: {
major: '18',
- full: '18.04',
+ full: '18.04'
},
distro: {
codename: 'trusty',
- id: 'Ubuntu',
- },
+ id: 'Ubuntu'
+ }
},
- puppet_vardir: '/opt/puppetlabs/puppet/cache',
+ puppet_vardir: '/opt/puppetlabs/puppet/cache'
}
end
let :params do
{
- 'package_manage' => true,
+ 'package_manage' => true
}
end
let(:title) { 'ppa:user/foo' }
it { is_expected.to contain_package('software-properties-common') }
+
it {
- is_expected.to contain_exec('add-apt-repository-ppa:user/foo')
+ expect(subject).to contain_exec('add-apt-repository-ppa:user/foo')
.that_notifies('Class[Apt::Update]')
.with(*ppa_exec_params('user', 'foo', 'trusty', ['http_proxy=http://localhost:8080']))
}
name: 'Ubuntu',
release: {
major: '18',
- full: '18.04',
+ full: '18.04'
},
distro: {
codename: 'trusty',
- id: 'Ubuntu',
- },
+ id: 'Ubuntu'
+ }
},
- puppet_vardir: '/opt/puppetlabs/puppet/cache',
+ puppet_vardir: '/opt/puppetlabs/puppet/cache'
}
end
let :params do
{
- package_manage: true,
+ package_manage: true
}
end
let(:title) { 'ppa:user/foo' }
it { is_expected.to contain_package('software-properties-common') }
+
it {
- is_expected.to contain_exec('add-apt-repository-ppa:user/foo')
+ expect(subject).to contain_exec('add-apt-repository-ppa:user/foo')
.that_notifies('Class[Apt::Update]')
.with(*ppa_exec_params('user', 'foo', 'trusty', ['http_proxy=http://localhost:8180']))
}
name: 'Ubuntu',
release: {
major: '18',
- full: '18.04',
+ full: '18.04'
},
distro: {
codename: 'trusty',
- id: 'Ubuntu',
- },
+ id: 'Ubuntu'
+ }
},
- puppet_vardir: '/opt/puppetlabs/puppet/cache',
+ puppet_vardir: '/opt/puppetlabs/puppet/cache'
}
end
let :params do
{
- package_manage: true,
+ package_manage: true
}
end
let(:title) { 'ppa:user/foo' }
it { is_expected.to contain_package('software-properties-common') }
+
it {
- is_expected.to contain_exec('add-apt-repository-ppa:user/foo')
+ expect(subject).to contain_exec('add-apt-repository-ppa:user/foo')
.that_notifies('Class[Apt::Update]')
.with(*ppa_exec_params('user', 'foo', 'trusty', ['http_proxy=http://localhost:8180', 'https_proxy=https://localhost:8180']))
}
name: 'Ubuntu',
release: {
major: '18',
- full: '18.04',
+ full: '18.04'
},
distro: {
codename: 'trusty',
- id: 'Ubuntu',
- },
+ id: 'Ubuntu'
+ }
},
- puppet_vardir: '/opt/puppetlabs/puppet/cache',
+ puppet_vardir: '/opt/puppetlabs/puppet/cache'
}
end
let :params do
{
- ensure: 'absent',
+ ensure: 'absent'
}
end
it {
- is_expected.to contain_tidy("remove-apt-repository-script-#{title}")
+ expect(subject).to contain_tidy("remove-apt-repository-script-#{title}")
.with('path' => '/opt/puppetlabs/puppet/cache/add-apt-repository-user-ubuntu-foo-trusty.sh')
- is_expected.to contain_tidy("remove-apt-repository-#{title}")
+ expect(subject).to contain_tidy("remove-apt-repository-#{title}")
.with('path' => '/etc/apt/sources.list.d/user-ubuntu-foo-trusty.list')
.that_notifies('Class[Apt::Update]')
}
name: 'Ubuntu',
release: {
major: '18',
- full: '18.04',
+ full: '18.04'
},
distro: {
codename: nil,
- id: 'Ubuntu',
- },
- },
+ id: 'Ubuntu'
+ }
+ }
}
end
let(:title) { 'ppa:user/foo' }
it do
- is_expected.to raise_error(Puppet::Error, %r{os.distro.codename fact not available: release parameter required})
+ expect(subject).to raise_error(Puppet::Error, %r{os.distro.codename fact not available: release parameter required})
end
end
name: 'Debian',
release: {
major: '6',
- full: '6.0.7',
+ full: '6.0.7'
},
distro: {
codename: 'wheezy',
- id: 'Debian',
- },
- },
+ id: 'Debian'
+ }
+ }
}
end
let(:title) { 'ppa:user/foo' }
it do
- is_expected.to raise_error(Puppet::Error, %r{not currently supported on Debian})
+ expect(subject).to raise_error(Puppet::Error, %r{not currently supported on Debian})
end
end
end