Merge pull request #234 from hunner/fix_dash_tests
Missed the - for -y, but also tests were missing lsbdistid
This commit is contained in:
commit
6f46fba2af
3 changed files with 16 additions and 7 deletions
1
Gemfile
1
Gemfile
|
@ -2,6 +2,7 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org'
|
||||||
|
|
||||||
group :development, :test do
|
group :development, :test do
|
||||||
gem 'rake', :require => false
|
gem 'rake', :require => false
|
||||||
|
gem 'pry', :require => false
|
||||||
gem 'rspec-puppet', :require => false
|
gem 'rspec-puppet', :require => false
|
||||||
gem 'puppet-lint', :require => false
|
gem 'puppet-lint', :require => false
|
||||||
gem 'puppetlabs_spec_helper', :require => false
|
gem 'puppetlabs_spec_helper', :require => false
|
||||||
|
|
|
@ -23,7 +23,7 @@ class apt::params {
|
||||||
case $::lsbdistcodename {
|
case $::lsbdistcodename {
|
||||||
'hardy','maverick','natty','oneiric','precise': {
|
'hardy','maverick','natty','oneiric','precise': {
|
||||||
$backports_location = 'http://us.archive.ubuntu.com/ubuntu'
|
$backports_location = 'http://us.archive.ubuntu.com/ubuntu'
|
||||||
$ppa_options = 'y'
|
$ppa_options = '-y'
|
||||||
}
|
}
|
||||||
'lucid': {
|
'lucid': {
|
||||||
$backports_location = 'http://us.archive.ubuntu.com/ubuntu'
|
$backports_location = 'http://us.archive.ubuntu.com/ubuntu'
|
||||||
|
@ -31,7 +31,7 @@ class apt::params {
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
$backports_location = 'http://old-releases.ubuntu.com/ubuntu'
|
$backports_location = 'http://old-releases.ubuntu.com/ubuntu'
|
||||||
$ppa_options = 'y'
|
$ppa_options = '-y'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,13 +1,20 @@
|
||||||
require 'spec_helper'
|
require 'spec_helper'
|
||||||
describe 'apt::ppa', :type => :define do
|
describe 'apt::ppa', :type => :define do
|
||||||
[ { :lsbdistrelease => '11.04',
|
[
|
||||||
|
{
|
||||||
|
:lsbdistrelease => '11.04',
|
||||||
:lsbdistcodename => 'natty',
|
:lsbdistcodename => 'natty',
|
||||||
:operatingsystem => 'Ubuntu',
|
:operatingsystem => 'Ubuntu',
|
||||||
:package => 'python-software-properties'},
|
:lsbdistid => 'Ubuntu',
|
||||||
{ :lsbdistrelease => '12.10',
|
:package => 'python-software-properties'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
:lsbdistrelease => '12.10',
|
||||||
:lsbdistcodename => 'quantal',
|
:lsbdistcodename => 'quantal',
|
||||||
:operatingsystem => 'Ubuntu',
|
:operatingsystem => 'Ubuntu',
|
||||||
:package => 'software-properties-common'},
|
:lsbdistid => 'Ubuntu',
|
||||||
|
:package => 'software-properties-common'
|
||||||
|
},
|
||||||
].each do |platform|
|
].each do |platform|
|
||||||
context "on #{platform[:lsbdistcodename]}" do
|
context "on #{platform[:lsbdistcodename]}" do
|
||||||
let :facts do
|
let :facts do
|
||||||
|
@ -15,6 +22,7 @@ describe 'apt::ppa', :type => :define do
|
||||||
:lsbdistrelease => platform[:lsbdistrelease],
|
:lsbdistrelease => platform[:lsbdistrelease],
|
||||||
:lsbdistcodename => platform[:lsbdistcodename],
|
:lsbdistcodename => platform[:lsbdistcodename],
|
||||||
:operatingsystem => platform[:operatingsystem],
|
:operatingsystem => platform[:operatingsystem],
|
||||||
|
:lsbdistid => platform[:lsbdistid],
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
let :release do
|
let :release do
|
||||||
|
|
Loading…
Reference in a new issue