puppet 2.6.18 → 2.7.1

data/test/other/report.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppet/reports'

data/test/other/transactions.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'mocha'
 require 'puppet'
@@ -114,39 +114,6 @@ class TestTransactions < Test::Unit::TestCase
     assert_equal({inst.title => inst}, $prefetched, "evaluate did not call prefetch")
   end
 
-  # We need to generate resources before we prefetch them, else generated
-  # resources that require prefetching don't work.
-  def test_generate_before_prefetch
-    config = mk_catalog
-    trans = Puppet::Transaction.new(config)
-
-    generate = nil
-    prefetch = nil
-    trans.expects(:generate).with { |*args| generate = Time.now; true }
-    trans.expects(:prefetch).with { |*args| ! generate.nil? }
-    trans.prepare
-    return
-
-    resource = Puppet::Type.type(:file).new :ensure => :present, :path => tempfile
-    other_resource = mock 'generated'
-    def resource.generate
-      [other_resource]
-    end
-
-
-    config = mk_catalog(yay, rah)
-    trans = Puppet::Transaction.new(config)
-
-    assert_nothing_raised do
-      trans.generate
-    end
-
-    %w{ya ra y r}.each do |name|
-      assert(trans.catalog.vertex?(Puppet::Type.type(:generator)[name]), "Generated #{name} was not a vertex")
-      assert($finished.include?(name), "#{name} was not finished")
-    end
-  end
-
   def test_ignore_tags?
     config = Puppet::Resource::Catalog.new
     config.host_config = true
@@ -235,7 +202,7 @@ class TestTransactions < Test::Unit::TestCase
     config = mk_catalog(one, two)
     trans = Puppet::Transaction.new(config)
     assert_raise(Puppet::Error) do
-      trans.prepare
+      trans.evaluate
     end
   end
 

data/test/puppet/defaults.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppettest'

data/test/puppet/errortest.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppettest'

data/test/puppet/tc_suidmanager.rb

@@ -0,0 +1,120 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
+
+require 'puppet'
+require 'puppettest'
+require 'test/unit'
+require 'mocha'
+
+class TestSUIDManager < Test::Unit::TestCase
+  include PuppetTest
+
+  def setup
+    the_id = 42
+    Puppet::Util::SUIDManager.stubs(:convert_xid).returns(the_id)
+    Puppet::Util::SUIDManager.stubs(:initgroups)
+    @user = stub('user', :uid => the_id, :gid => the_id, :name => 'name')
+    super
+  end
+
+  def test_metaprogramming_function_additions
+    # NOTE: the way that we are dynamically generating the methods in
+    # SUIDManager for the UID/GID calls was causing problems due to the
+    # modification of a closure. Should the bug rear itself again, this
+    # test will fail.
+    Process.expects(:uid).times(2)
+
+    assert_nothing_raised do
+      Puppet::Util::SUIDManager.uid
+      Puppet::Util::SUIDManager.uid
+    end
+  end
+
+  def test_id_set
+    Process.expects(:euid=).with(@user.uid)
+    Process.expects(:egid=).with(@user.gid)
+
+    assert_nothing_raised do
+      Puppet::Util::SUIDManager.egid = @user.gid
+      Puppet::Util::SUIDManager.euid = @user.uid
+    end
+  end
+
+  def test_utiluid
+    assert_not_equal(nil, Puppet::Util.uid(nonrootuser.name))
+  end
+
+  def test_asuser_as_root
+    Process.stubs(:uid).returns(0)
+    expects_id_set_and_revert @user.uid, @user.gid
+    Puppet::Util::SUIDManager.asuser @user.uid, @user.gid do end
+  rescue Errno::EPERM
+  end
+
+  def test_asuser_as_nonroot
+    Process.stubs(:uid).returns(1)
+    expects_no_id_set
+    Puppet::Util::SUIDManager.asuser @user.uid, @user.gid do end
+  end
+
+
+  def test_system_as_root
+    Process.stubs(:uid).returns(0)
+    set_exit_status!
+    expects_id_set_and_revert @user.uid, @user.gid
+    Kernel.expects(:system).with('blah')
+    Puppet::Util::SUIDManager.system('blah', @user.uid, @user.gid)
+  end
+
+  def test_system_as_nonroot
+    Process.stubs(:uid).returns(1)
+    set_exit_status!
+    expects_no_id_set
+    Kernel.expects(:system).with('blah')
+    Puppet::Util::SUIDManager.system('blah', @user.uid, @user.gid)
+  end
+
+  def test_run_and_capture
+    if (RUBY_VERSION <=> "1.8.4") < 0
+      warn "Cannot run this test on ruby < 1.8.4"
+    else
+      set_exit_status!
+      Puppet::Util.
+        expects(:execute).
+        with('yay',:combine => true, :failonfail => false, :uid => @user.uid, :gid => @user.gid).
+        returns('output')
+      output = Puppet::Util::SUIDManager.run_and_capture 'yay', @user.uid, @user.gid
+
+      assert_equal 'output', output.first
+      assert_kind_of Process::Status, output.last
+    end
+  end
+
+  private
+
+  def expects_id_set_and_revert(uid, gid)
+    Process.stubs(:groups=)
+    Process.expects(:euid).returns(99997)
+    Process.expects(:egid).returns(99996)
+
+    Process.expects(:euid=).with(uid)
+    Process.expects(:egid=).with(gid)
+
+    Process.expects(:euid=).with(99997)
+    Process.expects(:egid=).with(99996)
+  end
+
+  def expects_no_id_set
+    Process.expects(:egid).never
+    Process.expects(:euid).never
+    Process.expects(:egid=).never
+    Process.expects(:euid=).never
+  end
+
+  def set_exit_status!
+    # We want to make sure $CHILD_STATUS is set, this is the only way I know how.
+    Kernel.system '' if $CHILD_STATUS.nil?
+  end
+end
+

data/test/rails/rails.rb

@@ -1,10 +1,11 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppet/rails'
 require 'puppet/parser/parser'
+require 'puppet/network/client'
 require 'puppettest'
 require 'puppettest/parsertesting'
 require 'puppettest/resourcetesting'

data/test/rails/railsparameter.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppet/rails'
@@ -22,7 +22,7 @@ class TestRailsParameter < Test::Unit::TestCase
 
     # Now create a source
     parser = mkparser
-    source = parser.newclass "myclass"
+    source = parser.known_resource_types.add Puppet::Resource::Type.new(:hostclass, "myclass")
 
     host = Puppet::Rails::Host.new(:name => "myhost")
 

data/test/ral/manager/attributes.rb

@@ -3,7 +3,7 @@
 #  Created by Luke A. Kanies on 2007-02-05.
 #  Copyright (c) 2007. All rights reserved.
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'mocha'

data/test/ral/manager/instances.rb

@@ -3,7 +3,7 @@
 #  Created by Luke A. Kanies on 2007-06-10.
 #  Copyright (c) 2007. All rights reserved.
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 

data/test/ral/manager/manager.rb

@@ -3,7 +3,7 @@
 #  Created by Luke A. Kanies on 2006-11-29.
 #  Copyright (c) 2006. All rights reserved.
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 

data/test/ral/manager/provider.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'mocha'

data/test/ral/manager/type.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'mocha'
 require 'puppettest'

data/test/ral/providers/cron/crontab.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../../lib/puppettest')
 
 require 'puppettest'
 require 'mocha'

data/test/ral/providers/group.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'etc'

data/test/ral/providers/host/parsed.rb

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../../lib/puppettest')
 
-require 'etc'
 require 'puppettest'
 require 'puppettest/fileparsing'
 require 'test/unit'
@@ -25,210 +24,9 @@ class TestParsedHostProvider < Test::Unit::TestCase
     super
   end
 
-  def test_provider_existence
-    assert(@provider, "Could not retrieve provider")
-  end
-
-  # Here we just create a fake host type that answers to all of the methods
-  # but does not modify our actual system.
-  def mkfaketype
-    @provider.filetype = Puppet::Util::FileType.filetype(:ram)
-  end
-
-  def mkhosthash
-    if defined?(@hcount)
-      @hcount += 1
-    else
-      @hcount = 1
-    end
-
-    return {
-      :name => "fakehost#{@hcount}",
-      :ip => "192.168.27.#{@hcount}",
-      :host_aliases => ["alias#{@hcount}"],
-      :ensure => :present
-    }
-  end
-
-  def mkhost
-    hash = mkhosthash
-
-    fakeresource = fakeresource(:host, hash[:name])
-
-    host = @provider.new(fakeresource)
-
-    assert(host, "Could not create provider host")
-    hash.each do |name, val|
-      host.send(name.to_s + "=", val)
-    end
-
-    host
-  end
-
-  # Make sure we convert both directlys correctly using a simple host.
-  def test_basic_isomorphism
-    hash = {:record_type => :parsed, :name => "myhost", :ip => "192.168.43.56", :host_aliases => %w{another host}}
-
-    str = nil
-    assert_nothing_raised do
-      str = @provider.to_line(hash)
-    end
-
-    assert_equal("192.168.43.56\tmyhost\tanother\thost", str)
-
-    newhash = nil
-    assert_nothing_raised do
-      newhash = @provider.parse(str).shift
-    end
-
-    assert_equal(hash, newhash)
-  end
-
-  # Make sure parsing gets comments, blanks, and hosts
-  def test_blanks_and_comments
-    mkfaketype
-    text = %{# comment one
-
-192.168.43.56\tmyhost\tanother\thost
-    
-# another comment
-192.168.43.57\tanotherhost
-}
-
-    instances = nil
-    assert_nothing_raised do
-      instances = @provider.parse(text)
-    end
-
-
-          assert_equal(
-        [
-      {:record_type => :comment, :line => "# comment one"},
-      {:record_type => :blank, :line => ""},
-      {:record_type => :parsed, :name => "myhost", :ip => "192.168.43.56", :host_aliases => %w{another host}},
-      {:record_type => :blank, :line => "    "},
-      {:record_type => :comment, :line => "# another comment"},
-        
-      {:record_type => :parsed, :name => "anotherhost", :ip => "192.168.43.57", :host_aliases => []}
-    ], instances)
-
-    newtext = nil
-    assert_nothing_raised do
-      newtext = @provider.to_file(instances).gsub(/^# HEADER.+\n/, '')
-    end
-
-    assert_equal(text, newtext)
-  end
-
-  def test_simplehost
-    mkfaketype
-    @provider.default_target = :yayness
-    file = @provider.target_object(:yayness)
-
-    # Start out with no content.
-    assert_nothing_raised {
-      assert_equal([], @provider.parse(file.read))
-    }
-
-    # Now create a provider
-    host = nil
-    assert_nothing_raised {
-      host = mkhost
-    }
-
-    # Make sure we're still empty
-    assert_nothing_raised {
-      assert_equal([], @provider.parse(file.read))
-    }
-
-    # Try storing it
-    assert_nothing_raised do
-      host.flush
-    end
-
-    # Make sure we get the host back
-    assert_nothing_raised {
-
-            assert(
-        file.read.include?(host.name),
-        
-        "Did not flush host to disk")
-    }
-
-    # Remove a single field and make sure it gets tossed
-    name = host.host_aliases
-    host.host_aliases = [:absent]
-
-    assert_nothing_raised {
-      host.flush
-
-            assert(
-        ! file.read.include?(name[0]),
-        
-        "Did not remove host_aliases from disk")
-    }
-
-    # Make sure it throws up if we remove a required field
-    host.ip = :absent
-
-    assert_raise(ArgumentError) {
-      host.flush
-    }
-
-    # Now remove the whole object
-    host.ensure = :absent
-    assert_nothing_raised {
-      host.flush
-      assert_equal([], @provider.parse(file.read))
-    }
-  end
-
   # Parse our sample data and make sure we regenerate it correctly.
   def test_hostsparse
     fakedata("data/types/hosts").each do |file| fakedataparse(file) end
   end
-
-  # Make sure we can modify the file elsewhere and those modifications will
-  # get taken into account.
-  def test_modifyingfile
-    hostfile = tempfile
-    @provider.default_target = hostfile
-
-    file = @provider.target_object(hostfile)
-
-    hosts = []
-    3.times {
-      h = mkhost
-      hosts << h
-    }
-
-    hosts.each do |host|
-      host.flush
-    end
-
-    newhost = mkhost
-    hosts << newhost
-
-    # Now store our new host
-    newhost.flush
-
-    # Verify we can retrieve that info
-    assert_nothing_raised("Could not retrieve after second write") {
-      @provider.prefetch
-    }
-
-    text = file.read
-
-    instances = @provider.parse(text)
-
-    # And verify that we have data for everything
-    hosts.each { |host|
-      name = host.resource[:name]
-      assert(text.include?(name), "Host #{name} is not in file")
-      hash = host.property_hash
-      assert(! hash.empty?, "Could not find host #{name}")
-      assert(hash[:ip], "Could not find ip for host #{name}")
-    }
-  end
 end