puppet 2.6.0 → 2.6.1

data/spec/unit/simple_graph_spec.rb

@@ -439,7 +439,8 @@ describe Puppet::SimpleGraph do
       @middle = Container.new("middle", ["e", "f", @two])
       @top = Container.new("top", ["g", "h", @middle, @one, @three])
       @empty = Container.new("empty", [])
-
+      
+      @whit  = Puppet::Type.type(:whit)
       @stage = Puppet::Type.type(:stage).new(:name => "foo")
 
       @contgraph = @top.to_graph
@@ -499,8 +500,17 @@ describe Puppet::SimpleGraph do
       end
     end
 
+    it "should contain a whit-resource to mark the place held by the empty container" do
+      @depgraph.vertices.find_all { |v| v.is_a?(@whit) }.length.should == 1
+    end
+
+    it "should replace edges to empty containers with edges to their residual whit" do
+      emptys_whit = @depgraph.vertices.find_all { |v| v.is_a?(@whit) }.first
+      @depgraph.should be_edge("c", emptys_whit)
+    end
+
     it "should no longer contain anything but the non-container objects" do
-      @depgraph.vertices.find_all { |v| ! v.is_a?(String) }.should be_empty
+      @depgraph.vertices.find_all { |v| ! v.is_a?(String) and ! v.is_a?(@whit)}.should be_empty
     end
 
     it "should copy labels" do

data/spec/unit/transaction/resource_harness_spec.rb

@@ -50,7 +50,7 @@ describe Puppet::Transaction::ResourceHarness do
     end
 
     it "should cache and log the current value if no cached values are present" do
-      @resource.expects(:info)
+      @resource.expects(:debug)
       @harness.copy_audited_parameters(@resource, {:mode => "755"}).should == []
 
       @harness.cached(@resource, :mode).should == "755"

data/spec/unit/type/file/content_spec.rb

@@ -6,6 +6,7 @@ content = Puppet::Type.type(:file).attrclass(:content)
 describe content do
   before do
     @resource = Puppet::Type.type(:file).new :path => "/foo/bar"
+    content.stubs(:standalone?).returns(false)
   end
 
   it "should be a subclass of Property" do
@@ -362,7 +363,7 @@ describe content do
       end
 
       it "should send the correct indirection uri" do
-        @conn.expects(:request_get).with { |uri,headers| uri == "/production/file_content//path/to/source" }.yields(@response)
+        @conn.expects(:request_get).with { |uri,headers| uri == "/production/file_content/path/to/source" }.yields(@response)
         @content.write(@fh)
       end
 

data/spec/unit/type/schedule_spec.rb

@@ -41,7 +41,7 @@ end
 
 describe Puppet::Type.type(:schedule) do
   before :each do
-    Puppet.settings.stubs(:value).with(:ignoreschedules).returns(false)
+    Puppet[:ignoreschedules] = false
 
     @schedule = Puppet::Type.type(:schedule).new(:name => "testing")
   end

data/spec/unit/type/service_spec.rb

@@ -76,10 +76,18 @@ describe Puppet::Type.type(:service), "when validating attribute values" do
 
   it "should allow setting the :enable parameter if the provider has the :enableable feature" do
     Puppet::Type.type(:service).defaultprovider.stubs(:supports_parameter?).returns(true)
+    Puppet::Type.type(:service).defaultprovider.expects(:supports_parameter?).with(Puppet::Type.type(:service).attrclass(:enable)).returns(true)
     svc = Puppet::Type.type(:service).new(:name => "yay", :enable => true)
     svc.should(:enable).should == :true
   end
 
+  it "should not allow setting the :enable parameter if the provider is missing the :enableable feature" do
+    Puppet::Type.type(:service).defaultprovider.stubs(:supports_parameter?).returns(true)
+    Puppet::Type.type(:service).defaultprovider.expects(:supports_parameter?).with(Puppet::Type.type(:service).attrclass(:enable)).returns(false)
+    svc = Puppet::Type.type(:service).new(:name => "yay", :enable => true)
+    svc.should(:enable).should be_nil
+  end
+
   it "should split paths on ':'" do
     FileTest.stubs(:exist?).returns(true)
     FileTest.stubs(:directory?).returns(true)

data/spec/unit/type/user_spec.rb

@@ -262,6 +262,11 @@ describe user do
   end
 
   describe "when user has roles" do
+    before do
+      # To test this feature, we have to support it.
+      user.new(:name => "foo").provider.class.stubs(:feature?).returns(true)
+    end
+
     it "should autorequire roles" do
       testuser = Puppet::Type.type(:user).new(:name => "testuser")
       testuser[:roles] = "testrole"

data/spec/unit/util/backups_spec.rb

@@ -3,7 +3,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/util/backups'
-include PuppetTest
 
 describe Puppet::Util::Backups do
   before do

data/spec/unit/util/rdoc/parser_spec.rb

@@ -85,8 +85,8 @@ describe RDoc::Parser do
       @parser.scan_top_level(@topcontainer)
     end
 
-    it "should set the module as global if we parse the global manifests (ie <site> module)" do
-      @parser.stubs(:split_module).returns("<site>")
+    it "should set the module as global if we parse the global manifests (ie __site__ module)" do
+      @parser.stubs(:split_module).returns(RDoc::Parser::SITE)
       @parser.stubs(:parse_elements)
 
       @topcontainer.expects(:global=).with(true)
@@ -131,7 +131,7 @@ describe RDoc::Parser do
     it "should return <site> for manifests not under module path" do
       File.stubs(:expand_path).returns("/path/to/manifests/init.pp")
       File.stubs(:identical?).returns(false)
-      @parser.split_module("/path/to/manifests/init.pp").should == "<site>"
+      @parser.split_module("/path/to/manifests/init.pp").should == RDoc::Parser::SITE
     end
   end
 

data/spec/unit/util/rdoc_spec.rb

@@ -75,6 +75,19 @@ describe Puppet::Util::RDoc do
       Puppet::Util::RDoc.manifestdoc([])
     end
 
+    it "should use a parser with the correct environment" do
+      FileTest.stubs(:file?).returns(true)
+      Puppet::Util::RDoc.stubs(:output)
+
+      parser = stub_everything
+      Puppet::Parser::Parser.stubs(:new).with{ |env| env.is_a?(Puppet::Node::Environment) }.returns(parser)
+
+      parser.expects(:file=).with("file")
+      parser.expects(:parse)
+
+      Puppet::Util::RDoc.manifestdoc(["file"])
+    end
+
     it "should puppet parse all given files" do
       FileTest.stubs(:file?).returns(true)
       Puppet::Util::RDoc.stubs(:output)

data/test/certmgr/support.rb

@@ -89,8 +89,9 @@ class TestCertSupport < Test::Unit::TestCase
       should_path = Puppet[:hostprivkey]
 
       dir, file = File.split(should_path)
-      newfile = file.sub(/^([a-z.]+)\./) { $1.upcase + "."}
+      newfile = file.sub(/^([-a-z.0-9]+)\./) { $1.upcase + "."}
       upper_path = File.join(dir, newfile)
+p upper_path
       File.open(upper_path, "w") { |f| f.print key.to_s }
 
       user = CertUser.new

data/test/language/parser.rb

@@ -97,7 +97,7 @@ class TestParser < Test::Unit::TestCase
     }
 
     4.times { |i|
-      path = File.join(basedir, subdir, "subfile#{i}")
+      path = File.join(basedir, subdir, "subfile#{i}.pp")
       mkmanifest(path)
     }
 
@@ -137,8 +137,8 @@ class TestParser < Test::Unit::TestCase
   end
 
   def test_importedclasses
-    imported = tempfile
-    importer = tempfile
+    imported = tempfile '.pp'
+    importer = tempfile '.pp'
 
     made = tempfile
 
@@ -655,9 +655,9 @@ file { "/tmp/yayness":
   end
 
   def test_multiple_imports_on_one_line
-    one = tempfile
-    two = tempfile
-    base = tempfile
+    one = tempfile '.pp'
+    two = tempfile '.pp'
+    base = tempfile '.pp'
     File.open(one, "w") { |f| f.puts "$var = value" }
     File.open(two, "w") { |f| f.puts "$var = value" }
     File.open(base, "w") { |f| f.puts "import '#{one}', '#{two}'" }

data/test/lib/puppettest.rb

@@ -6,17 +6,6 @@ mainlib = File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))
 $LOAD_PATH.unshift(mainlib) unless $LOAD_PATH.include?(mainlib)
 
 require 'puppet'
-
-# include any gems in vendor/gems
-Dir["#{mainlib}/../vendor/gems/**"].each do |path|
-  libpath = File.join(path, "lib")
-  if File.directory?(libpath)
-    $LOAD_PATH.unshift(libpath)
-  else
-    $LOAD_PATH.unshift(path)
-  end
-end
-
 require 'mocha'
 
 # Only load the test/unit class if we're not in the spec directory.
@@ -31,16 +20,7 @@ if ARGV.include?("-d")
   $console = true
 end
 
-# Some monkey-patching to allow us to test private methods.
-class Class
-  def publicize_methods(*methods)
-    saved_private_instance_methods = methods.empty? ? self.private_instance_methods : methods
-
-    self.class_eval { public(*saved_private_instance_methods) }
-    yield
-    self.class_eval { private(*saved_private_instance_methods) }
-  end
-end
+require File.expand_path(File.join(File.dirname(__FILE__), '../../spec/monkey_patches/publicize_methods'))
 
 module PuppetTest
   # These need to be here for when rspec tests use these
@@ -227,14 +207,14 @@ module PuppetTest
     #Facter.stubs(:to_hash).returns({})
   end
 
-  def tempfile
+  def tempfile(suffix = '')
     if defined?(@@tmpfilenum)
       @@tmpfilenum += 1
     else
       @@tmpfilenum = 1
     end
 
-    f = File.join(self.tmpdir, "tempfile_" + @@tmpfilenum.to_s)
+    f = File.join(self.tmpdir, "tempfile_" + @@tmpfilenum.to_s + suffix)
     @@tmpfiles ||= []
     @@tmpfiles << f
     f

data/test/lib/puppettest/fakes.rb

@@ -1,4 +1,4 @@
-require 'puppettest'
+require File.expand_path(File.join(File.dirname(__FILE__), '../../../lib/puppet/util'))
 
 module PuppetTest
   # A baseclass for the faketypes.

data/test/lib/puppettest/support/assertions.rb

@@ -1,8 +1,6 @@
-require 'puppettest'
 require 'puppettest/support/utils'
 require 'fileutils'
 
-
 module PuppetTest
   include PuppetTest::Support::Utils
   def assert_logged(level, regex, msg = nil)

data/test/lib/puppettest/support/utils.rb

@@ -1,5 +1,3 @@
-require 'puppettest'
-
 module PuppetTest::Support
 end
 module PuppetTest::Support::Utils
@@ -7,6 +5,30 @@ module PuppetTest::Support::Utils
     Puppet.warning "#{type}: #{ObjectSpace.each_object(type) { |o| }}"
   end
 
+  def basedir(*list)
+    unless defined? @@basedir
+      Dir.chdir(File.dirname(__FILE__)) do
+        @@basedir = File.dirname(File.dirname(File.dirname(File.dirname(Dir.getwd))))
+      end
+    end
+    if list.empty?
+      @@basedir
+    else
+      File.join(@@basedir, *list)
+    end
+  end
+
+  def fakedata(dir,pat='*')
+    glob = "#{basedir}/test/#{dir}/#{pat}"
+    files = Dir.glob(glob,File::FNM_PATHNAME)
+    raise Puppet::DevError, "No fakedata matching #{glob}" if files.empty?
+    files
+  end
+
+  def datadir(*list)
+    File.join(basedir, "test", "data", *list)
+  end
+
   #
   # TODO: I think this method needs to be renamed to something a little more
   # explanatory.
@@ -38,10 +60,6 @@ module PuppetTest::Support::Utils
     config
   end
 
-  # stop any services that might be hanging around
-  def stopservices
-  end
-
   # TODO: rewrite this to use the 'etc' module.
 
   # Define a variable that contains the name of my user.
@@ -84,7 +102,7 @@ module PuppetTest::Support::Utils
   end
 
   def fakefile(name)
-    ary = [PuppetTest.basedir, "test"]
+    ary = [basedir, "test"]
     ary += name.split("/")
     file = File.join(ary)
     raise Puppet::DevError, "No fakedata file #{file}" unless FileTest.exists?(file)
@@ -140,16 +158,3 @@ module PuppetTest::Support::Utils
     config
   end
 end
-
-module PuppetTest
-  include PuppetTest::Support::Utils
-
-  def fakedata(dir,pat='*')
-    glob = "#{basedir}/test/#{dir}/#{pat}"
-    files = Dir.glob(glob,File::FNM_PATHNAME)
-    raise Puppet::DevError, "No fakedata matching #{glob}" if files.empty?
-    files
-  end
-  module_function :fakedata
-
-end

data/test/ral/manager/attributes.rb

@@ -229,7 +229,10 @@ class TestTypeAttributes < Test::Unit::TestCase
       end
       yes.each { |a| assert(resource.should(a), "Did not get value for #{a} in #{prov.name}") }
       no.each do |a|
-        # These may or may not get passed to the provider. We shouldn't care.
+        assert_nil(resource.should(a), "Got value for unsupported %s in %s" % [a, prov.name])
+        if Puppet::Util::Log.sendlevel?(:info)
+          assert(@logs.find { |l| l.message =~ /not managing attribute #{a}/ and l.level == :info }, "No warning about failed %s" % a)
+        end
       end
 
       @logs.clear

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 2
   - 6
-  - 0
-  version: 2.6.0
+  - 1
+  version: 2.6.1
 platform: ruby
 authors: 
 - Puppet Labs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-20 00:00:00 +10:00
+date: 2010-09-14 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -222,6 +222,7 @@ files:
 - lib/puppet/parser/resource.rb
 - lib/puppet/parser/templatewrapper.rb
 - lib/puppet/parser/functions/template.rb
+- lib/puppet/parser/functions/md5.rb
 - lib/puppet/parser/functions/include.rb
 - lib/puppet/parser/functions/realize.rb
 - lib/puppet/parser/functions/versioncmp.rb
@@ -236,6 +237,7 @@ files:
 - lib/puppet/parser/functions/tagged.rb
 - lib/puppet/parser/functions/split.rb
 - lib/puppet/parser/functions/file.rb
+- lib/puppet/parser/functions/extlookup.rb
 - lib/puppet/parser/functions/fail.rb
 - lib/puppet/parser/functions/fqdn_rand.rb
 - lib/puppet/parser/functions/require.rb
@@ -580,6 +582,7 @@ files:
 - lib/puppet/type/nagios_servicegroup.rb
 - lib/puppet/type/k5login.rb
 - lib/puppet/type/nagios_service.rb
+- lib/puppet/type/whit.rb
 - lib/puppet/type/nagios_contactgroup.rb
 - lib/puppet/type/nagios_hostgroup.rb
 - lib/puppet/type/nagios_hostextinfo.rb
@@ -629,9 +632,12 @@ files:
 - conf/freebsd/puppetmasterd
 - conf/epm.list
 - conf/suse/client.init
-- conf/suse/puppet.suse.patch
+- conf/suse/fileserver.conf
+- conf/suse/ruby-env.patch
 - conf/suse/puppet.spec
 - conf/suse/server.init
+- conf/suse/puppet.conf
+- conf/suse/logrotate
 - conf/puppet-queue.conf
 - conf/redhat/client.init
 - conf/redhat/fileserver.conf
@@ -703,6 +709,7 @@ files:
 - ext/emacs/puppet-mode.el
 - ext/dbfix.sql
 - ext/puppetstoredconfigclean.rb
+- ext/puppet-load.rb
 - ext/autotest/readme.rst
 - ext/autotest/Rakefile
 - ext/autotest/config
@@ -726,8 +733,6 @@ files:
 - ext/vim/syntax/puppet.vim
 - ext/vim/README
 - ext/yaml_nodes.rb
-- ext/extlookup.rb
-- ext/puppetlast
 - tasks/rake/sign.rake
 - tasks/rake/testbranch.rake
 - tasks/rake/dailybuild.rake
@@ -737,7 +742,6 @@ files:
 - tasks/rake/gem.rake
 - tasks/rake/yard.rake
 - tasks/rake/git_workflow.rake
-- tasks/rake/tracdocs.rake
 - test/data/reports/tagmail_failers.conf
 - test/data/reports/1.yaml
 - test/data/reports/tagmail_passers.conf
@@ -887,7 +891,6 @@ files:
 - test/test
 - test/lib/rake/puppet_testtask.rb
 - test/lib/rake/puppet_test_loader.rb
-- test/lib/mocha_standalone.rb
 - test/lib/puppettest.rb
 - test/lib/puppettest/filetesting.rb
 - test/lib/puppettest/runnable_test.rb
@@ -932,6 +935,7 @@ files:
 - test/util/log.rb
 - test/util/fileparsing.rb
 - spec/fixtures/yaml/test.local.yaml
+- spec/monkey_patches/publicize_methods.rb
 - spec/monkey_patches/alias_should_to_must.rb
 - spec/monkey_patches/add_confine_and_runnable_to_rspec_dsl.rb
 - spec/shared_behaviours/memory_terminus.rb
@@ -1050,11 +1054,13 @@ files:
 - spec/unit/parser/functions/regsubst_spec.rb
 - spec/unit/parser/functions/template_spec.rb
 - spec/unit/parser/functions/fqdn_rand_spec.rb
+- spec/unit/parser/functions/include_spec.rb
 - spec/unit/parser/functions/sprintf_spec.rb
 - spec/unit/parser/functions/tag_spec.rb
 - spec/unit/parser/functions/versioncmp_spec.rb
 - spec/unit/parser/functions/split_spec.rb
 - spec/unit/parser/functions/generate_spec.rb
+- spec/unit/parser/functions/extlookup_spec.rb
 - spec/unit/parser/functions/shellquote_spec.rb
 - spec/unit/parser/functions/inline_template_spec.rb
 - spec/unit/parser/functions/realize_spec.rb