Merging the state-rename branch. This includes the diff from version 2156 to 2168. All states should now be properties, with backward compatibility for the types that restricted themselves to the methods.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2169 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 8 insertions, 8 deletions

diff --git a/test/server/resource.rb b/test/server/resource.rb
index 218b65f74..5a2f602ba 100755
--- a/test/server/resource.rb
+++ b/test/server/resource.rb
@@ -79,12 +79,12 @@ class TestResourceServer < Test::Unit::TestCase
 
                 assert(object, "Could not create type")
 
-                retrieve.each do |state|
-                    assert(object.should(state), "Did not retrieve %s" % state)
+                retrieve.each do |property|
+                    assert(object.should(property), "Did not retrieve %s" % property)
                 end
 
-                ignore.each do |state|
-                    assert(! object.should(state), "Incorrectly retrieved %s" % state)
+                ignore.each do |property|
+                    assert(! object.should(property), "Incorrectly retrieved %s" % property)
                 end
 
                 if i == 0
@@ -154,12 +154,12 @@ class TestResourceServer < Test::Unit::TestCase
 
             assert(object, "Could not create type")
 
-            retrieve.each do |state|
-                assert(object.should(state), "Did not retrieve %s" % state)
+            retrieve.each do |property|
+                assert(object.should(property), "Did not retrieve %s" % property)
             end
 
-            ignore.each do |state|
-                assert(! object.should(state), "Incorrectly retrieved %s" % state)
+            ignore.each do |property|
+                assert(! object.should(property), "Incorrectly retrieved %s" % property)
             end
 
             assert_events([:directory_created], object)