[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. 2.6.3-345-g919f443

[Markus Roberts]

The following commit has been merged in the master branch:
commit c8b6fb5bed057bf25a25c9e1b3f55bedf64ba775
Author: James Turnbull <james at lovedthanlost.net>
Date:   Mon Nov 15 19:41:43 2010 +1100

    Fixed #5296 - test warnings messages

diff --git a/spec/integration/parser/ruby_manifest_spec.rb b/spec/integration/parser/ruby_manifest_spec.rb
index af110d3..de6f462 100644
--- a/spec/integration/parser/ruby_manifest_spec.rb
+++ b/spec/integration/parser/ruby_manifest_spec.rb
@@ -69,7 +69,7 @@ describe "Pure ruby manifests" do
     write_file('foo.rb', "hostclass 'bar' do file 'test_file', :owner => 'root', :mode => '644' end")
     catalog = compile("import 'foo'\ninclude bar")
     file = catalog.resource("File[test_file]")
-    file.should be_a Puppet::Resource
+    file.should be_a(Puppet::Resource)
     file.type.should == 'File'
     file.title.should == 'test_file'
     file.exported.should_not be
diff --git a/spec/unit/application/apply_spec.rb b/spec/unit/application/apply_spec.rb
index 85098f4..877c47b 100755
--- a/spec/unit/application/apply_spec.rb
+++ b/spec/unit/application/apply_spec.rb
@@ -312,7 +312,7 @@ describe Puppet::Application::Apply do
       end
 
       it "should apply the catalog" do
-        @catalog.expects(:apply).returns(stub_everything 'transaction')
+        @catalog.expects(:apply).returns(stub_everything('transaction'))
 
         @apply.main
       end
diff --git a/spec/unit/parser/ast/leaf_spec.rb b/spec/unit/parser/ast/leaf_spec.rb
index 384ee08..a19c241 100755
--- a/spec/unit/parser/ast/leaf_spec.rb
+++ b/spec/unit/parser/ast/leaf_spec.rb
@@ -49,7 +49,7 @@ describe Puppet::Parser::AST::String do
     end
     it "should return a dup of its value" do
       value = ""
-      Puppet::Parser::AST::String.new( :value => value ).evaluate(stub 'scope').should_not be_equal(value)
+      Puppet::Parser::AST::String.new( :value => value ).evaluate(stub('scope')).should_not be_equal(value)
     end
   end
 end
diff --git a/spec/unit/parser/ast/resource_spec.rb b/spec/unit/parser/ast/resource_spec.rb
index e1f73e1..721c31a 100755
--- a/spec/unit/parser/ast/resource_spec.rb
+++ b/spec/unit/parser/ast/resource_spec.rb
@@ -152,7 +152,7 @@ describe Puppet::Parser::AST::Resource do
       result = @resource.evaluate(@scope)
       result.length.should == 1
       result.first.ref.should == "Class[Classname]"
-      @compiler.catalog.resource("Class[Classname]").should equal result.first
+      @compiler.catalog.resource("Class[Classname]").should equal(result.first)
     end
 
     it "should cause its parent to be evaluated" do
@@ -163,7 +163,7 @@ describe Puppet::Parser::AST::Resource do
       result = @resource.evaluate(@scope)
       result.length.should == 1
       result.first.ref.should == "Class[Classname]"
-      @compiler.catalog.resource("Class[Classname]").should equal result.first
+      @compiler.catalog.resource("Class[Classname]").should equal(result.first)
       @compiler.catalog.resource("Class[Parentname]").should be_instance_of(Puppet::Parser::Resource)
     end
 
diff --git a/spec/unit/rails_spec.rb b/spec/unit/rails_spec.rb
index d30e52b..24248e6 100755
--- a/spec/unit/rails_spec.rb
+++ b/spec/unit/rails_spec.rb
@@ -180,13 +180,13 @@ describe Puppet::Rails, "when initializing a mysql connection" do
     Puppet.settings.stubs(:value).with(:dbsocket).returns("testsocket")
 
     Puppet.settings.stubs(:value).with(:dbconnections).returns(0)
-    Puppet::Rails.database_arguments.should_not be_include :pool
+    Puppet::Rails.database_arguments.should_not be_include(:pool)
 
     Puppet.settings.stubs(:value).with(:dbconnections).returns('0')
-    Puppet::Rails.database_arguments.should_not be_include :pool
+    Puppet::Rails.database_arguments.should_not be_include(:pool)
 
     Puppet.settings.stubs(:value).with(:dbconnections).returns('')
-    Puppet::Rails.database_arguments.should_not be_include :pool
+    Puppet::Rails.database_arguments.should_not be_include(:pool)
   end
 end
 
@@ -253,13 +253,13 @@ describe Puppet::Rails, "when initializing a postgresql connection" do
     Puppet.settings.stubs(:value).with(:dbsocket).returns("testsocket")
 
     Puppet.settings.stubs(:value).with(:dbconnections).returns(0)
-    Puppet::Rails.database_arguments.should_not be_include :pool
+    Puppet::Rails.database_arguments.should_not be_include(:pool)
 
     Puppet.settings.stubs(:value).with(:dbconnections).returns('0')
-    Puppet::Rails.database_arguments.should_not be_include :pool
+    Puppet::Rails.database_arguments.should_not be_include(:pool)
 
     Puppet.settings.stubs(:value).with(:dbconnections).returns('')
-    Puppet::Rails.database_arguments.should_not be_include :pool
+    Puppet::Rails.database_arguments.should_not be_include(:pool)
   end
 end
 
@@ -313,12 +313,12 @@ describe Puppet::Rails, "when initializing an Oracle connection" do
     Puppet.settings.stubs(:value).with(:dbsocket).returns("testsocket")
 
     Puppet.settings.stubs(:value).with(:dbconnections).returns(0)
-    Puppet::Rails.database_arguments.should_not be_include :pool
+    Puppet::Rails.database_arguments.should_not be_include(:pool)
 
     Puppet.settings.stubs(:value).with(:dbconnections).returns('0')
-    Puppet::Rails.database_arguments.should_not be_include :pool
+    Puppet::Rails.database_arguments.should_not be_include(:pool)
 
     Puppet.settings.stubs(:value).with(:dbconnections).returns('')
-    Puppet::Rails.database_arguments.should_not be_include :pool
+    Puppet::Rails.database_arguments.should_not be_include(:pool)
   end
 end

-- 
Puppet packaging for Debian