[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[Luke Kanies]

The following commit has been merged in the upstream branch:
commit fe140a283fc51216a460be24c19641e26724c92c
Author: Luke Kanies <luke at puppetlabs.com>
Date:   Fri Apr 9 15:55:17 2010 -0700

    Migrating "puppet" executable integration test
    
    Signed-off-by: Luke Kanies <luke at puppetlabs.com>

diff --git a/spec/integration/application/puppet.rb b/spec/integration/application/main.rb
similarity index 89%
rename from spec/integration/application/puppet.rb
rename to spec/integration/application/main.rb
index cfafc9c..b8933e4 100755
--- a/spec/integration/application/puppet.rb
+++ b/spec/integration/application/main.rb
@@ -4,9 +4,9 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet_spec/files'
 
-require 'puppet/application/puppet'
+require 'puppet/application/main'
 
-describe "Puppet" do
+describe "main" do
     include PuppetSpec::Files
 
     describe "when applying provided catalogs" do
@@ -21,7 +21,7 @@ describe "Puppet" do
 
             File.open(manifest, "w") { |f| f.print catalog.to_pson }
 
-            puppet = Puppet::Application[:puppet]
+            puppet = Puppet::Application[:main]
             puppet.options[:catalog] = manifest
 
             puppet.apply

-- 
Puppet packaging for Debian