Removing the long-obsolete Element base class. The Parameter and Type classes no longer have the same base class.

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

5 files changed, 8 insertions, 6 deletions

diff --git a/test/network/client/master.rb b/test/network/client/master.rb
index 64ff34314..87eb22b31 100755
--- a/test/network/client/master.rb
+++ b/test/network/client/master.rb
@@ -261,6 +261,7 @@ class TestMasterClient < Test::Unit::TestCase
     end
 
     def test_getplugins
+        Puppet[:filetimeout] = -1
         Puppet[:pluginsource] = tempfile()
         Dir.mkdir(Puppet[:pluginsource])
 
@@ -328,6 +329,7 @@ end
     end
 
     def test_getfacts
+        Puppet[:filetimeout] = -1
         Puppet[:factsource] = tempfile()
         Dir.mkdir(Puppet[:factsource])
         hostname = Facter.value(:hostname)
diff --git a/test/other/propertychange.rb b/test/other/propertychange.rb
index 31321753b..6d5c91b34 100755
--- a/test/other/propertychange.rb
+++ b/test/other/propertychange.rb
@@ -9,7 +9,7 @@ require 'puppettest'
 
 class TestPropertyChange < Test::Unit::TestCase
 	include PuppetTest
-	class FakeProperty < Puppet::Type::Property
+	class FakeProperty < Puppet::Property
 	    attr_accessor :is, :should, :resource
 	    attr_reader :noop
 	    def change_to_s(currentvalue, newvalue)
diff --git a/test/other/transactions.rb b/test/other/transactions.rb
index 4cb65dbe3..887c86a96 100755
--- a/test/other/transactions.rb
+++ b/test/other/transactions.rb
@@ -12,7 +12,7 @@ require 'puppettest/support/resources'
 class TestTransactions < Test::Unit::TestCase
     include PuppetTest::FileTesting
     include PuppetTest::Support::Resources
-    class Fakeprop <Puppet::Type::Property
+    class Fakeprop <Puppet::Property
         attr_accessor :path, :is, :should, :name
         def should_to_s
             @should.to_s
diff --git a/test/ral/types/package.rb b/test/ral/types/package.rb
index 6e0ddc035..0fa02e984 100755
--- a/test/ral/types/package.rb
+++ b/test/ral/types/package.rb
@@ -70,7 +70,7 @@ class TestPackages < Test::Unit::TestCase
         when "Solaris": :sun
         end
 
-        unless default = Puppet.type(:package).defaultprovider
+        unless default = Puppet::Type.type(:package).defaultprovider
             $stderr.puts "no default provider for %s" %
                 Facter["operatingsystem"].value
             return
diff --git a/test/ral/types/parameter.rb b/test/ral/types/parameter.rb
index 865add14a..bc79d0bd5 100755
--- a/test/ral/types/parameter.rb
+++ b/test/ral/types/parameter.rb
@@ -123,7 +123,7 @@ class TestParameter < Test::Unit::TestCase
         assert(obj, "did not get alias parameter")
         assert(obj.shadow, "shadow was not created for alias param")
 
-        assert(obj.is_a?(Puppet::Type::Property),
+        assert(obj.is_a?(Puppet::Property),
             "alias instance is not a property")
         assert_instance_of(param, obj, "alias is an instance of the wrong class")
 
@@ -141,7 +141,7 @@ class TestParameter < Test::Unit::TestCase
         assert(obj.shadow, "shadow was not created for alias param")
 
         assert_instance_of(param, obj, "alias is an instance of the wrong class")
-        assert(obj.is_a?(Puppet::Type::Property),
+        assert(obj.is_a?(Puppet::Property),
             "alias instance is not a property")
 
         # Now change the alias and make sure it works out well
@@ -152,7 +152,7 @@ class TestParameter < Test::Unit::TestCase
         obj = params[:alias]
         assert(obj, "did not get alias parameter")
         assert_instance_of(param, obj, "alias is now an instance of the wrong class")
-        assert(obj.is_a?(Puppet::Type::Property),
+        assert(obj.is_a?(Puppet::Property),
             "alias instance is now not a property")
     end