]> review.fuel-infra Code Review - puppet-modules/puppetlabs-apt.git/commitdiff
Fix broken unit tests
authorMorgan Haskel <morgan@puppetlabs.com>
Wed, 18 Feb 2015 19:43:50 +0000 (11:43 -0800)
committerMorgan Haskel <morgan@puppetlabs.com>
Wed, 18 Feb 2015 19:43:50 +0000 (11:43 -0800)
spec/classes/debian_testing_spec.rb [deleted file]
spec/classes/debian_unstable_spec.rb [deleted file]
spec/defines/conf_spec.rb
spec/defines/pin_spec.rb
spec/defines/ppa_spec.rb
spec/defines/source_spec.rb

diff --git a/spec/classes/debian_testing_spec.rb b/spec/classes/debian_testing_spec.rb
deleted file mode 100644 (file)
index 6e03326..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-describe 'apt::debian::testing', :type => :class do
-  let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian' } }
-  it {
-    should contain_apt__source("debian_testing").with({
-      "location"            => "http://debian.mirror.iweb.ca/debian/",
-      "release"             => "testing",
-      "repos"               => "main contrib non-free",
-      "required_packages"   => "debian-keyring debian-archive-keyring",
-      "key"                 => "46925553",
-      "key_server"          => "subkeys.pgp.net",
-      "pin"                 => "-10"
-    })
-  }
-end
diff --git a/spec/classes/debian_unstable_spec.rb b/spec/classes/debian_unstable_spec.rb
deleted file mode 100644 (file)
index 8477a39..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-describe 'apt::debian::unstable', :type => :class do
-  let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian' } }
-  it {
-    should contain_apt__source("debian_unstable").with({
-      "location"          => "http://debian.mirror.iweb.ca/debian/",
-      "release"           => "unstable",
-      "repos"             => "main contrib non-free",
-      "required_packages" => "debian-keyring debian-archive-keyring",
-      "key"               => "46925553",
-      "key_server"        => "subkeys.pgp.net",
-      "pin"               => "-10"
-    })
-  }
-end
index 91b6d4e62fbf10a1268c74acb9d77f3441bc7f8a..208f209a27ef57eaf46c8becd44698484468a469 100644 (file)
@@ -1,5 +1,8 @@
 require 'spec_helper'
 describe 'apt::conf', :type => :define do
+  let :pre_condition do
+    'class { "apt": }'
+  end
   let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian' } }
   let :title do
     'norecommends'
index 206dbf1e011e4a6b336826d63bc9528319177713..b4443cc241b09e9d8c9ce1f9a6637d2c65a2a95e 100644 (file)
@@ -1,5 +1,8 @@
 require 'spec_helper'
 describe 'apt::pin', :type => :define do
+  let :pre_condition do
+    'class { "apt": }'
+  end
   let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian' } }
   let(:title) { 'my_pin' }
 
index e10481ef8d4ef30374f7d4b2ec01a1665dcfd9a7..f078204ed8ba39213a869b031a8b97d3d6412e45 100644 (file)
@@ -68,6 +68,9 @@ describe 'apt::ppa', :type => :define do
   end
 
   describe 'ensure absent' do
+    let :pre_condition do
+      'class { "apt": }'
+    end
     let :facts do
       {
         :lsbdistrelease  => '14.04',
index 8ca7f8e20308f763910b800e60c6c41db9a32d72..684a6f06561da45a2751b9694b4580e78f632821 100644 (file)
@@ -3,6 +3,9 @@ require 'spec_helper'
 describe 'apt::source', :type => :define do
   GPG_KEY_ID = '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30'
 
+  let :pre_condition do
+    'class { "apt": }'
+  end
 
   let :title do
     'my_source'