summaryrefslogtreecommitdiffstats
path: root/test/server
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-01-31 19:38:02 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-01-31 19:38:02 +0000
commitc8f38b7fee12eefb2bed00681b4952ac7ad3f14f (patch)
tree09af773e01670eb4ea6efbb1ca3c303711caf9d0 /test/server
parentea73cdbec49f9451d04902e69ad9fe4bf07a3c11 (diff)
downloadpuppet-c8f38b7fee12eefb2bed00681b4952ac7ad3f14f.tar.gz
puppet-c8f38b7fee12eefb2bed00681b4952ac7ad3f14f.tar.xz
puppet-c8f38b7fee12eefb2bed00681b4952ac7ad3f14f.zip
Renaming "pelement" to "resource". The old name is a holdover from before we had settled on "resource" as a term.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2137 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test/server')
-rwxr-xr-xtest/server/resource.rb (renamed from test/server/pelement.rb)12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/server/pelement.rb b/test/server/resource.rb
index c86dadc11..218b65f74 100755
--- a/test/server/pelement.rb
+++ b/test/server/resource.rb
@@ -3,12 +3,12 @@
$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
require 'puppet'
-require 'puppet/server/pelement'
+require 'puppet/server/resource'
require 'puppettest'
require 'base64'
require 'cgi'
-class TestPElementServer < Test::Unit::TestCase
+class TestResourceServer < Test::Unit::TestCase
include PuppetTest::ServerTest
def verify_described(type, described)
@@ -39,7 +39,7 @@ class TestPElementServer < Test::Unit::TestCase
server = nil
assert_nothing_raised do
- server = Puppet::Server::PElement.new()
+ server = Puppet::Server::Resource.new()
end
# The first run we create the file on the copy, the second run
@@ -119,7 +119,7 @@ class TestPElementServer < Test::Unit::TestCase
server = nil
assert_nothing_raised do
- server = Puppet::Server::PElement.new()
+ server = Puppet::Server::Resource.new()
end
[ [nil],
@@ -177,7 +177,7 @@ class TestPElementServer < Test::Unit::TestCase
#Puppet.err Puppet::Type::ParsedType::Port.path
server = nil
assert_nothing_raised do
- server = Puppet::Server::PElement.new()
+ server = Puppet::Server::Resource.new()
end
require 'etc'
@@ -239,7 +239,7 @@ class TestPElementServer < Test::Unit::TestCase
def test_apply
server = nil
assert_nothing_raised do
- server = Puppet::Server::PElement.new()
+ server = Puppet::Server::Resource.new()
end
file = tempfile()