Duh, fixing all of the paths being loaded for spec in the moved tests.

19 files changed, 54 insertions, 44 deletions

diff --git a/spec/integration/type/package.rb b/spec/integration/type/package.rb
index 20567629d..c244fa1cd 100755
--- a/spec/integration/type/package.rb
+++ b/spec/integration/type/package.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/type/package'
 
diff --git a/spec/unit/provider/interface/redhat.rb b/spec/unit/provider/interface/redhat.rb
index 9bf1b9722..5a7a8dfcd 100755
--- a/spec/unit/provider/interface/redhat.rb
+++ b/spec/unit/provider/interface/redhat.rb
@@ -3,7 +3,7 @@
 #  Created by Luke Kanies on 2007-11-20.
 #  Copyright (c) 2006. All rights reserved.
 
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 provider_class = Puppet::Type.type(:interface).provider(:redhat)
 
diff --git a/spec/unit/provider/interface/sunos.rb b/spec/unit/provider/interface/sunos.rb
index 7b9f462e6..6a7bd19c1 100755
--- a/spec/unit/provider/interface/sunos.rb
+++ b/spec/unit/provider/interface/sunos.rb
@@ -3,7 +3,7 @@
 #  Created by Luke Kanies on 2007-11-25.
 #  Copyright (c) 2006. All rights reserved.
 
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 require 'puppet/provider/interface/sunos'
 
diff --git a/spec/unit/provider/mount.rb b/spec/unit/provider/mount.rb
index 0b90d53c9..41abcd424 100755
--- a/spec/unit/provider/mount.rb
+++ b/spec/unit/provider/mount.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/provider/mount'
 
diff --git a/spec/unit/provider/mount/parsed.rb b/spec/unit/provider/mount/parsed.rb
index 21276d911..ba65b70a4 100755
--- a/spec/unit/provider/mount/parsed.rb
+++ b/spec/unit/provider/mount/parsed.rb
@@ -3,7 +3,7 @@
 #  Created by Luke Kanies on 2007-9-12.
 #  Copyright (c) 2006. All rights reserved.
 
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 require 'puppettest/support/utils'
 require 'puppettest/fileparsing'
diff --git a/spec/unit/provider/ssh_authorized_key/parsed.rb b/spec/unit/provider/ssh_authorized_key/parsed.rb
index 459001cb5..c35ddc513 100755
--- a/spec/unit/provider/ssh_authorized_key/parsed.rb
+++ b/spec/unit/provider/ssh_authorized_key/parsed.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 require 'puppettest'
 require 'puppettest/support/utils'
diff --git a/spec/unit/type.rb b/spec/unit/type.rb
index 5980167d6..9815ed32d 100755
--- a/spec/unit/type.rb
+++ b/spec/unit/type.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Puppet::Type, " when in a configuration" do
     before do
diff --git a/spec/unit/type/exec.rb b/spec/unit/type/exec.rb
index 260804227..cf0e02929 100755
--- a/spec/unit/type/exec.rb
+++ b/spec/unit/type/exec.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/type/exec'
 
diff --git a/spec/unit/type/file.rb b/spec/unit/type/file.rb
index e1a597434..12b806d88 100755
--- a/spec/unit/type/file.rb
+++ b/spec/unit/type/file.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Puppet::Type.type(:file) do
     before do
diff --git a/spec/unit/type/interface.rb b/spec/unit/type/interface.rb
index 2e0176152..27f34b7e0 100755
--- a/spec/unit/type/interface.rb
+++ b/spec/unit/type/interface.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 interface = Puppet::Type.type(:interface)
 
diff --git a/spec/unit/type/mount.rb b/spec/unit/type/mount.rb
index 8fa2e6f7c..a9b78672e 100755
--- a/spec/unit/type/mount.rb
+++ b/spec/unit/type/mount.rb
@@ -1,77 +1,75 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
-require 'puppet/type/mount'
-
-describe Puppet::Type::Mount do
+describe Puppet::Type.type(:mount) do
     it "should have a :refreshable feature that requires the :remount method" do
-        Puppet::Type::Mount.provider_feature(:refreshable).methods.should == [:remount]
+        Puppet::Type.type(:mount).provider_feature(:refreshable).methods.should == [:remount]
     end
 
     it "should have no default value for :ensure" do
-        mount = Puppet::Type::Mount.create(:name => "yay")
+        mount = Puppet::Type.type(:mount).create(:name => "yay")
         mount.should(:ensure).should be_nil
     end
 
-    after { Puppet::Type::Mount.clear }
+    after { Puppet::Type.type(:mount).clear }
 end
 
-describe Puppet::Type::Mount, "when validating attributes" do
+describe Puppet::Type.type(:mount), "when validating attributes" do
     [:name, :remounts].each do |param|
         it "should have a #{param} parameter" do
-            Puppet::Type::Mount.attrtype(param).should == :param
+            Puppet::Type.type(:mount).attrtype(param).should == :param
         end
     end
 
     [:ensure, :device, :blockdevice, :fstype, :options, :pass, :dump, :atboot, :target].each do |param|
         it "should have a #{param} property" do
-            Puppet::Type::Mount.attrtype(param).should == :property
+            Puppet::Type.type(:mount).attrtype(param).should == :property
         end
     end
 end
 
-describe Puppet::Type::Mount::Ensure, "when validating values" do
+describe Puppet::Type.type(:mount)::Ensure, "when validating values" do
     before do
-        @provider = stub 'provider', :class => Puppet::Type::Mount.defaultprovider, :clear => nil
-        Puppet::Type::Mount.defaultprovider.expects(:new).returns(@provider)
+        @provider = stub 'provider', :class => Puppet::Type.type(:mount).defaultprovider, :clear => nil
+        Puppet::Type.type(:mount).defaultprovider.expects(:new).returns(@provider)
     end
 
     it "should support :present as a value to :ensure" do
-        Puppet::Type::Mount.create(:name => "yay", :ensure => :present)
+        Puppet::Type.type(:mount).create(:name => "yay", :ensure => :present)
     end
 
     it "should alias :unmounted to :present as a value to :ensure" do
-        mount = Puppet::Type::Mount.create(:name => "yay", :ensure => :unmounted)
+        mount = Puppet::Type.type(:mount).create(:name => "yay", :ensure => :unmounted)
         mount.should(:ensure).should == :present
     end
 
     it "should support :absent as a value to :ensure" do
-        Puppet::Type::Mount.create(:name => "yay", :ensure => :absent)
+        Puppet::Type.type(:mount).create(:name => "yay", :ensure => :absent)
     end
 
     it "should support :mounted as a value to :ensure" do
-        Puppet::Type::Mount.create(:name => "yay", :ensure => :mounted)
+        Puppet::Type.type(:mount).create(:name => "yay", :ensure => :mounted)
     end
 
-    after { Puppet::Type::Mount.clear }
+    after { Puppet::Type.type(:mount).clear }
 end
 
-describe Puppet::Type::Mount::Ensure do
+describe Puppet::Type.type(:mount)::Ensure do
     before :each do
-        @provider = stub 'provider', :class => Puppet::Type::Mount.defaultprovider, :clear => nil, :satisfies? => true, :name => :mock
-        Puppet::Type::Mount.defaultprovider.stubs(:new).returns(@provider)
-        @mount = Puppet::Type::Mount.create(:name => "yay", :check => :ensure)
+        @provider = stub 'provider', :class => Puppet::Type.type(:mount).defaultprovider, :clear => nil, :satisfies? => true, :name => :mock
+        Puppet::Type.type(:mount).defaultprovider.stubs(:new).returns(@provider)
+        @mount = Puppet::Type.type(:mount).create(:name => "yay", :check => :ensure)
 
         @ensure = @mount.property(:ensure)
     end
 
     after :each do
-        Puppet::Type::Mount.clear
+        Puppet::Type.type(:mount).clear
     end
     
     def mount_stub(params)
-        Puppet::Type::Mount.validproperties.each do |prop|
+        Puppet::Type.type(:mount).validproperties.each do |prop|
             unless params[prop]
                 params[prop] = :absent
                 @mount[prop] = :absent
@@ -83,7 +81,7 @@ describe Puppet::Type::Mount::Ensure do
         end
     end
 
-    describe Puppet::Type::Mount::Ensure, "when retrieving its current state" do
+    describe Puppet::Type.type(:mount)::Ensure, "when retrieving its current state" do
 
         it "should return the provider's value if it is :absent" do
             @provider.expects(:ensure).returns(:absent)
@@ -103,7 +101,7 @@ describe Puppet::Type::Mount::Ensure do
         end
     end
 
-    describe Puppet::Type::Mount::Ensure, "when changing the host" do
+    describe Puppet::Type.type(:mount)::Ensure, "when changing the host" do
 
         it "should destroy itself if it should be absent" do
             @provider.stubs(:mounted?).returns(false)
@@ -166,7 +164,7 @@ describe Puppet::Type::Mount::Ensure do
         end
     end
 
-    describe Puppet::Type::Mount, "when responding to events" do
+    describe Puppet::Type.type(:mount), "when responding to events" do
 
         it "should remount if it is currently mounted" do
             @provider.expects(:mounted?).returns(true)
diff --git a/spec/unit/type/nagios.rb b/spec/unit/type/nagios.rb
index 35f00b0e5..563c82c2f 100755
--- a/spec/unit/type/nagios.rb
+++ b/spec/unit/type/nagios.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/external/nagios'
 
diff --git a/spec/unit/type/noop_metaparam.rb b/spec/unit/type/noop_metaparam.rb
index 0cbed3714..2a3e0160d 100755
--- a/spec/unit/type/noop_metaparam.rb
+++ b/spec/unit/type/noop_metaparam.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/metatype/metaparams'
 
diff --git a/spec/unit/type/package.rb b/spec/unit/type/package.rb
index 5d96dc4ae..335910c63 100755
--- a/spec/unit/type/package.rb
+++ b/spec/unit/type/package.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/type/package'
 
diff --git a/spec/unit/type/schedule.rb b/spec/unit/type/schedule.rb
index 4e9840c34..da38f68a9 100755
--- a/spec/unit/type/schedule.rb
+++ b/spec/unit/type/schedule.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/type/schedule'
 
diff --git a/spec/unit/type/service.rb b/spec/unit/type/service.rb
index 0f00992fa..e8358cb22 100755
--- a/spec/unit/type/service.rb
+++ b/spec/unit/type/service.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/type/service'
 
diff --git a/spec/unit/type/ssh_authorized_key.rb b/spec/unit/type/ssh_authorized_key.rb
index d27cb9f25..0e869747d 100755
--- a/spec/unit/type/ssh_authorized_key.rb
+++ b/spec/unit/type/ssh_authorized_key.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 ssh_authorized_key = Puppet::Type.type(:ssh_authorized_key)
 
diff --git a/spec/unit/type/user.rb b/spec/unit/type/user.rb
index b697426dc..d16d752f9 100755
--- a/spec/unit/type/user.rb
+++ b/spec/unit/type/user.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 module UserTestFunctions
     def mkuser(name)
diff --git a/test/ral/providers/provider.rb b/test/ral/providers/provider.rb
index 2196fafce..349a56d5e 100755
--- a/test/ral/providers/provider.rb
+++ b/test/ral/providers/provider.rb
@@ -82,6 +82,18 @@ class TestProvider < Test::Unit::TestCase
         assert(! provider.suitable?)
     end
 
+    # #1197 - the binary should not be
+    def test_command_checks_for_binaries_each_time
+        provider = newprovider
+
+        provider.commands :testing => "/no/such/path"
+
+        provider.expects(:binary).returns "/no/such/path"
+
+        provider.command(:testing)
+        assert_equal("/no/such/path", provider.command(:testing), "Did not return correct binary path")
+    end
+
     def test_command
         {:echo => "echo", :echo_with_path => echo, :missing => "nosuchcommand", :missing_qualified => "/path/to/nosuchcommand"}.each do |name, command|
             provider = newprovider