From cfda651f88d12249f29706d2bedbfddce7a2e6f7 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Mon, 14 Jan 2008 13:34:06 -0800 Subject: Another round of test-fixes toward eliminating global resource references. This should have gotten rid of all of them, and now it's just a question of fixing a few hopefully unrelated failing tests. --- test/util/posixtest.rb | 10 ---------- test/util/utiltest.rb | 19 ------------------- 2 files changed, 29 deletions(-) (limited to 'test/util') diff --git a/test/util/posixtest.rb b/test/util/posixtest.rb index 34d68e3a2..8fd11b086 100755 --- a/test/util/posixtest.rb +++ b/test/util/posixtest.rb @@ -35,16 +35,6 @@ class TestPosixUtil < Test::Unit::TestCase end end - def test_get_provider_value - user = nonrootuser - obj = mk_posix_resource(:user, user) - - assert_nothing_raised do - assert_equal(user.uid, get_provider_value(:user, :uid, user.uid)) - assert_equal(user.name, get_provider_value(:user, :name, user.name)) - end - end - def test_gid_and_uid {:user => nonrootuser, :group => nonrootgroup}.each do |type, obj| method = idfield(type) diff --git a/test/util/utiltest.rb b/test/util/utiltest.rb index 35e1446a1..a8dfca9c2 100755 --- a/test/util/utiltest.rb +++ b/test/util/utiltest.rb @@ -264,24 +264,5 @@ class TestPuppetUtil < Test::Unit::TestCase # Puppet::Util.execute(cmd, 0, 0) #} end - - # This is mostly to test #380. - def test_get_provider_value - group = Puppet::Type.type(:group).create :name => "yayness", :ensure => :present - - root = Puppet::Type.type(:user).create :name => "root", :ensure => :present - - val = nil - assert_nothing_raised do - val = Puppet::Util.get_provider_value(:group, :gid, "yayness") - end - assert_nil(val, "returned a value on a missing group") - - # Now make sure we get a value for one we know exists - assert_nothing_raised do - val = Puppet::Util.get_provider_value(:user, :uid, "root") - end - assert_equal(0, val, "got invalid uid for root") - end end -- cgit