summaryrefslogtreecommitdiffstats
path: root/test/ral/providers
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-12-17 18:29:58 -0600
committerLuke Kanies <luke@madstop.com>2008-12-18 11:10:25 -0600
commite4ba3db1963081eacc2aef3d865f777b427ef23c (patch)
tree55a4aa8cdde262880a8affb6cbd4470d49c10c55 /test/ral/providers
parentb6db54585177f277b1e06bebd4d925d5c272b610 (diff)
downloadpuppet-e4ba3db1963081eacc2aef3d865f777b427ef23c.tar.gz
puppet-e4ba3db1963081eacc2aef3d865f777b427ef23c.tar.xz
puppet-e4ba3db1963081eacc2aef3d865f777b427ef23c.zip
Deprecating the Puppet::Type.create.
This method is no longer necessary; you can use the normal 'new' class method. Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'test/ral/providers')
-rwxr-xr-xtest/ral/providers/cron/crontab.rb14
-rwxr-xr-xtest/ral/providers/group.rb2
-rwxr-xr-xtest/ral/providers/package/aptitude.rb4
-rwxr-xr-xtest/ral/providers/package/aptrpm.rb6
-rwxr-xr-xtest/ral/providers/parsedfile.rb8
-rwxr-xr-xtest/ral/providers/provider.rb4
-rwxr-xr-xtest/ral/providers/service/base.rb4
-rwxr-xr-xtest/ral/providers/user.rb4
-rwxr-xr-xtest/ral/providers/user/useradd.rb4
9 files changed, 25 insertions, 25 deletions
diff --git a/test/ral/providers/cron/crontab.rb b/test/ral/providers/cron/crontab.rb
index d9f460258..2ad7997a2 100755
--- a/test/ral/providers/cron/crontab.rb
+++ b/test/ral/providers/cron/crontab.rb
@@ -435,13 +435,13 @@ class TestCronParsedProvider < Test::Unit::TestCase
# Now make some crons that should match
matchers = [
- @type.create(
+ @type.new(
:name => "yaycron",
:minute => [0, 30],
:command => "date",
:user => @me
),
- @type.create(
+ @type.new(
:name => "youtest",
:command => "yaytest",
:user => you
@@ -449,14 +449,14 @@ class TestCronParsedProvider < Test::Unit::TestCase
]
nonmatchers = [
- @type.create(
+ @type.new(
:name => "footest",
:minute => [0, 30],
:hour => 1,
:command => "fooness",
:user => @me # wrong target
),
- @type.create(
+ @type.new(
:name => "funtest2",
:command => "funtest",
:user => you # wrong target for this cron
@@ -464,7 +464,7 @@ class TestCronParsedProvider < Test::Unit::TestCase
]
# Create another cron so we prefetch two of them
- @type.create(:name => "testing", :minute => 30, :command => "whatever", :user => "you")
+ @type.new(:name => "testing", :minute => 30, :command => "whatever", :user => "you")
assert_nothing_raised("Could not prefetch cron") do
@provider.prefetch([matchers, nonmatchers].flatten.inject({}) { |crons, cron| crons[cron.name] = cron; crons })
@@ -555,7 +555,7 @@ class TestCronParsedProvider < Test::Unit::TestCase
end
def test_prefetch
- cron = @type.create :command => "/bin/echo yay", :name => "test", :hour => 4
+ cron = @type.new :command => "/bin/echo yay", :name => "test", :hour => 4
assert_nothing_raised("Could not prefetch cron") do
cron.provider.class.prefetch("test" => cron)
@@ -570,7 +570,7 @@ class TestCronParsedProvider < Test::Unit::TestCase
target = @provider.target_object(@me)
# First with no env settings
- resource = @type.create :command => "/bin/echo yay", :name => "test", :hour => 4
+ resource = @type.new :command => "/bin/echo yay", :name => "test", :hour => 4
cron = resource.provider
cron.ensure = :present
diff --git a/test/ral/providers/group.rb b/test/ral/providers/group.rb
index 520d9f7ec..044545be1 100755
--- a/test/ral/providers/group.rb
+++ b/test/ral/providers/group.rb
@@ -240,7 +240,7 @@ class TestGroupProvider < Test::Unit::TestCase
def test_autogen
provider = nil
- group = Puppet::Type.type(:group).create(:name => nonrootgroup.name)
+ group = Puppet::Type.type(:group).new(:name => nonrootgroup.name)
provider = group.provider
assert(provider, "did not get provider")
diff --git a/test/ral/providers/package/aptitude.rb b/test/ral/providers/package/aptitude.rb
index 881f54047..a7c0c84ac 100755
--- a/test/ral/providers/package/aptitude.rb
+++ b/test/ral/providers/package/aptitude.rb
@@ -14,7 +14,7 @@ class AptitudePackageProviderTest < PuppetTest::TestCase
end
def test_install
- pkg = @type.create :name => 'faff',
+ pkg = @type.new :name => 'faff',
:provider => :aptitude,
:ensure => :present,
:source => "/tmp/faff.deb"
@@ -46,7 +46,7 @@ class AptitudePackageProviderTest < PuppetTest::TestCase
end
def test_purge
- pkg = @type.create :name => 'faff', :provider => :aptitude, :ensure => :purged
+ pkg = @type.new :name => 'faff', :provider => :aptitude, :ensure => :purged
pkg.provider.expects(
:dpkgquery
diff --git a/test/ral/providers/package/aptrpm.rb b/test/ral/providers/package/aptrpm.rb
index 32e0ea6e5..8a107c4d7 100755
--- a/test/ral/providers/package/aptrpm.rb
+++ b/test/ral/providers/package/aptrpm.rb
@@ -14,7 +14,7 @@ class AptrpmPackageProviderTest < PuppetTest::TestCase
end
def test_install
- pkg = @type.create :name => 'faff',
+ pkg = @type.new :name => 'faff',
:provider => :aptrpm,
:ensure => :present,
:source => "/tmp/faff.rpm"
@@ -43,7 +43,7 @@ class AptrpmPackageProviderTest < PuppetTest::TestCase
end
def test_uninstall
- pkg = @type.create :name => 'faff', :provider => :aptrpm, :ensure => :absent
+ pkg = @type.new :name => 'faff', :provider => :aptrpm, :ensure => :absent
pkg.provider.expects(
:rpm
@@ -71,7 +71,7 @@ class AptrpmPackageProviderTest < PuppetTest::TestCase
# LAK: I don't know where this test will ever return true..
def disabled_test_latest
- pkg = @type.create :name => 'ssh', :provider => :aptrpm
+ pkg = @type.new :name => 'ssh', :provider => :aptrpm
assert(pkg, "did not create pkg")
status = pkg.provider.query
diff --git a/test/ral/providers/parsedfile.rb b/test/ral/providers/parsedfile.rb
index 18fe70fd0..aef2a5492 100755
--- a/test/ral/providers/parsedfile.rb
+++ b/test/ral/providers/parsedfile.rb
@@ -47,7 +47,7 @@ class TestParsedFile < Test::Unit::TestCase
options[:two] ||= "c"
options[:name] ||= name
- resource = @type.create(options)
+ resource = @type.new(options)
end
def mkprovider(name = :parsed)
@@ -610,7 +610,7 @@ class TestParsedFile < Test::Unit::TestCase
# Now make a resource
bill = nil
assert_nothing_raised do
- bill = @type.create :name => "bill"
+ bill = @type.new :name => "bill"
end
assert_equal("a", bill.provider.one,
@@ -627,7 +627,7 @@ class TestParsedFile < Test::Unit::TestCase
bill = nil
assert_nothing_raised do
- bill = @type.create :name => "bill",
+ bill = @type.new :name => "bill",
:one => "a", :two => "c"
end
@@ -683,7 +683,7 @@ class TestParsedFile < Test::Unit::TestCase
otarget.write("oname b d\n")
# Now make a resource that targets elsewhat.
- res = @type.create(:name => "test", :one => "a", :two => "c",
+ res = @type.new(:name => "test", :one => "a", :two => "c",
:target => opath)
assert(res.property(:target), "Target is a parameter, not a property")
diff --git a/test/ral/providers/provider.rb b/test/ral/providers/provider.rb
index 70f606a37..25f1d605f 100755
--- a/test/ral/providers/provider.rb
+++ b/test/ral/providers/provider.rb
@@ -319,7 +319,7 @@ class TestProvider < Test::Unit::TestCase
def test_initialize
test = @type.provide(:test)
- inst = @type.create :name => "boo"
+ inst = @type.new :name => "boo"
prov = nil
assert_nothing_raised("Could not init with a resource") do
prov = test.new(inst)
@@ -381,7 +381,7 @@ class TestProviderFeatures < Test::Unit::TestCase
end
end
- resource = @type.create(:name => "foo")
+ resource = @type.new(:name => "foo")
{:numbers => [:numeric], :letters => [:alpha], :both => [:numeric, :alpha],
:mixed => [], :neither => []}.each do |name, should|
should.sort! { |a,b| a.to_s <=> b.to_s }
diff --git a/test/ral/providers/service/base.rb b/test/ral/providers/service/base.rb
index 934127a10..c11ce4801 100755
--- a/test/ral/providers/service/base.rb
+++ b/test/ral/providers/service/base.rb
@@ -22,7 +22,7 @@ class TestBaseServiceProvider < Test::Unit::TestCase
end
commands[c.to_sym] = path
end
- service = Puppet::Type.type(:service).create(
+ service = Puppet::Type.type(:service).new(
:name => "yaytest", :provider => :base,
:start => "%s %s" % [commands[:touch], running],
:status => "%s -f %s" % [commands[:test], running],
@@ -51,7 +51,7 @@ class TestBaseServiceProvider < Test::Unit::TestCase
# Testing #454
def test_that_failures_propagate
nope = "/no/such/command"
- service = Puppet::Type.type(:service).create(
+ service = Puppet::Type.type(:service).new(
:name => "yaytest", :provider => :base,
:start => nope,
:status => nope,
diff --git a/test/ral/providers/user.rb b/test/ral/providers/user.rb
index 567c01bbc..1cb139b7d 100755
--- a/test/ral/providers/user.rb
+++ b/test/ral/providers/user.rb
@@ -370,7 +370,7 @@ class TestUserProvider < Test::Unit::TestCase
5.times do |i|
i += 1
name = "pptstgr%s" % i
- tmpgroup = Puppet::Type.type(:group).create(
+ tmpgroup = Puppet::Type.type(:group).new(
:name => name,
:gid => max + i
)
@@ -538,7 +538,7 @@ class TestUserProvider < Test::Unit::TestCase
def test_autogen
provider = nil
- user = Puppet::Type.type(:user).create(:name => nonrootuser.name)
+ user = Puppet::Type.type(:user).new(:name => nonrootuser.name)
provider = user.provider
assert(provider, "did not get provider")
diff --git a/test/ral/providers/user/useradd.rb b/test/ral/providers/user/useradd.rb
index 28692be6c..f791a054a 100755
--- a/test/ral/providers/user/useradd.rb
+++ b/test/ral/providers/user/useradd.rb
@@ -25,7 +25,7 @@ class UserAddProviderTest < PuppetTest::TestCase
end
def setup_user
- @user = @type.create(@vals)
+ @user = @type.new(@vals)
@vals.each do |name, val|
next unless @user.class.validproperty?(name)
@@ -230,7 +230,7 @@ class UserRootAddProviderTest < PuppetTest::TestCase
confine "not running as root" => (Process.uid == 0)
def test_password
- user = Puppet::Type.type(:user).create(:name => "root", :check => [:password], :provider => :useradd)
+ user = Puppet::Type.type(:user).new(:name => "root", :check => [:password], :provider => :useradd)
provider = user.provider