[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/2.6.0-2-104-g203dd6f

[Mathias Gug]

The following commit has been merged in the master branch:
commit e3699a23fc3a6a085959d5dc8fb70322df6e8007
Author: Mathias Gug <mathias.gug at canonical.com>
Date:   Wed Aug 18 18:24:28 2010 -0400

    Fix test suite to use puppet system library.
    
     + spec/unit/application/apply_spec.rb: Fix test suite to use puppet
       system library.

diff --git a/debian/changelog b/debian/changelog
index 31f12af..b2d9918 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,11 @@ puppet (2.6.1~rc2-1) UNRELEASED; urgency=low
 
   * New upstream version:
     - fix config.ru file to run puppetmaster as a rack application.
-  * Rakefile: use system puppet.rb file to detect version.
+  * Fix test suite to run from a package install rather then from the source
+    directory:
+    + Rakefile: use system puppet.rb file to detect version.
+    + spec/unit/application/apply_spec.rb: Fix test suite to use puppet 
+      system library.
   * Fix init service provider to correctly check the status of services
     using upstart jobs (LP: #551544).
 
diff --git a/spec/unit/application/apply_spec.rb b/spec/unit/application/apply_spec.rb
index 0b00d1a..a9cd4eb 100755
--- a/spec/unit/application/apply_spec.rb
+++ b/spec/unit/application/apply_spec.rb
@@ -53,7 +53,7 @@ describe Puppet::Application::Apply do
       Puppet.stubs(:trap)
       Puppet::Log.stubs(:level=)
       Puppet.stubs(:parse_config)
-      require 'lib/puppet/file_bucket/dipper'
+      require '/usr/lib/ruby/1.8/puppet/file_bucket/dipper'
       Puppet::FileBucket::Dipper.stubs(:new)
       STDIN.stubs(:read)
 

-- 
Puppet packaging for Debian