Merge pull request #303 from apenney/fix-ubuntu-10-tests

Fix the tests for Ubuntu 10.04.

diff --git a/spec/acceptance/apt_key_provider_spec.rb b/spec/acceptance/apt_key_provider_spec.rb
index 9becd2568419af3ac59f9c5e82ce78ba0dc2ae6f..0a314959577c953ed7b99a8a3519de4c2986ce57 100644 (file)
--- a/spec/acceptance/apt_key_provider_spec.rb
+++ b/spec/acceptance/apt_key_provider_spec.rb
@@ -203,7 +203,7 @@ ugVIB2pi+8u84f+an4Hml4xlyijgYu05pqNvnLRyJDLd61hviLC8GYU=
         EOS
 
         apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/Host not found/)
+          expect(r.stderr).to match(/(Host not found|Couldn't resolve host)/)
         end
       end
     end

diff --git a/spec/acceptance/force_spec.rb b/spec/acceptance/force_spec.rb
index a43902300d7c0c1067db5660ee82396186eda631..5f4dec3fc76487705b147c368a3563bf194da2e3 100644 (file)
--- a/spec/acceptance/force_spec.rb
+++ b/spec/acceptance/force_spec.rb
@@ -59,7 +59,7 @@ describe 'apt::force define', :unless => UNSUPPORTED_PLATFORMS.include?(fact('os
     it 'should work with no errors' do
       pp = <<-EOS
       include apt
-      apt::force { 'vim': timeout => '1' }
+      apt::force { 'ocaml': timeout => '1' }
       EOS
 
       shell('apt-get clean')
@@ -68,7 +68,7 @@ describe 'apt::force define', :unless => UNSUPPORTED_PLATFORMS.include?(fact('os
       end
     end
 
-    describe package('vim') do
+    describe package('ocaml') do
       it { should_not be_installed }
     end
   end