[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

[Daniel Pittman]

The following commit has been merged in the experimental branch:
commit 92499c86bc7fcc4c7b7d5de838973868a5e0aba2
Author: Daniel Pittman <daniel at rimspace.net>
Date:   Thu Mar 3 00:41:04 2011 -0800

    (#6582) Eliminate the last vestige of the unit tests from the specs.
    
    This eliminates a stub module in spec_helper, which was used for compatibility
    with code that didn't bother to require the right files out of the unit tests.
    
    It also removes test/lib from LOAD_PATH when running specs, since we don't run
    with that code, and now we detect that as a larger scale test failure.
    
    Reviewed-By: Nick Lewis <nick at puppetlabs.com>

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 7f36544..8d539fa 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -6,7 +6,6 @@ dir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{dir}/")
 $LOAD_PATH.unshift("#{dir}/lib") # a spec-specific test lib dir
 $LOAD_PATH.unshift("#{dir}/../lib")
-$LOAD_PATH.unshift("#{dir}/../test/lib")
 
 # Don't want puppet getting the command line arguments for rake or autotest
 ARGV.clear
@@ -20,9 +19,6 @@ module PuppetSpec
   FIXTURE_DIR = File.join(dir = File.expand_path(File.dirname(__FILE__)), "fixtures") unless defined?(FIXTURE_DIR)
 end
 
-module PuppetTest
-end
-
 require 'lib/puppet_spec/files'
 require 'lib/puppet_spec/fixtures'
 require 'monkey_patches/alias_should_to_must'

-- 
Puppet packaging for Debian