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

[Matt Robinson]

The following commit has been merged in the experimental branch:
commit fb8509acbd947712cac094a49227d28a16a366aa
Merge: 480c399f183627f5f588e9dc9f5f86f683c0e468 cc1f2b39a65e8b74c8e59a2bf7d8f47a35985ee4
Author: Matt Robinson <matt at puppetlabs.com>
Date:   Thu Dec 16 14:59:06 2010 -0800

    Merge branch '2.6.x' into next
    
    * 2.6.x:
      maint: Fix ActiveRecord confine issue
      maint: Fix a test that was missing a require
      maint: Fix tests that don't run on their own
    
    Manually Resolved Conflicts:
    	spec/unit/network/http/rack/xmlrpc_spec.rb
    	spec/unit/network/http/rack_spec.rb
    	spec/unit/network/http/webrick_spec.rb
    	spec/unit/parser/templatewrapper_spec.rb
    	spec/unit/rails/param_value_spec.rb
    	spec/unit/rails/resource_spec.rb

diff --combined spec/unit/indirector/catalog/active_record_spec.rb
index 71975f0,ba8f1da..27310e4
--- a/spec/unit/indirector/catalog/active_record_spec.rb
+++ b/spec/unit/indirector/catalog/active_record_spec.rb
@@@ -1,26 -1,29 +1,29 @@@
  #!/usr/bin/env ruby
  
 -require File.dirname(__FILE__) + '/../../../spec_helper'
 +require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
  
  
  describe "Puppet::Resource::Catalog::ActiveRecord" do
    confine "Missing Rails" => Puppet.features.rails?
  
    require 'puppet/rails'
-   class Tableless < ActiveRecord::Base
-     def self.columns
-       @columns ||= []
-     end
-     def self.column(name, sql_type=nil, default=nil, null=true)
-       columns << ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, sql_type.to_s, null)
+ 
+   before :all do
+     class Tableless < ActiveRecord::Base
+       def self.columns
+         @columns ||= []
+       end
+       def self.column(name, sql_type=nil, default=nil, null=true)
+         columns << ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, sql_type.to_s, null)
+       end
      end
-   end
  
-   class Host < Tableless
-     column :name, :string, :null => false
-     column :ip, :string
-     column :environment, :string
-     column :last_compile, :datetime
+     class Host < Tableless
+       column :name, :string, :null => false
+       column :ip, :string
+       column :environment, :string
+       column :last_compile, :datetime
+     end
    end
  
    before do

-- 
Puppet packaging for Debian