Moving the mount provider tests into a subdir, and fixing the basedir calculation in tests so it does not matter where the test is called from

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

3 files changed, 3 insertions, 16 deletions

diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb
index 6e3d8cd4c..e83cc9a04 100755
--- a/test/lib/puppettest.rb
+++ b/test/lib/puppettest.rb
@@ -11,21 +11,8 @@ module PuppetTest
     # the parent of that dir.
     def basedir(*list)
         unless defined? @@basedir
-            case
-            when $0 =~ /rake_test_loader/
-                @@basedir = File.dirname(Dir.getwd)
-            when ENV['BASEDIR']
-                @@basedir = ENV['BASEDIR']
-            else
-                dir = nil
-                app = $0.sub /^\.\//, ""
-                if app =~ /^#{File::SEPARATOR}.+\.rb/
-                    dir = app
-                else
-                    dir = File.join(Dir.getwd, app)
-                end
-                3.times { dir = File.dirname(dir) }
-                @@basedir = dir
+            Dir.chdir(File.dirname(__FILE__)) do
+                @@basedir = File.dirname(File.dirname(Dir.getwd))
             end
         end
         if list.empty?
diff --git a/test/providers/netinfo_mount.rb b/test/providers/mount/netinfo.rb
index fcd814264..fcd814264 100755
--- a/test/providers/netinfo_mount.rb
+++ b/test/providers/mount/netinfo.rb
diff --git a/test/providers/parsedmount.rb b/test/providers/mount/parsed.rb
index 868dde617..e09218e6c 100755
--- a/test/providers/parsedmount.rb
+++ b/test/providers/mount/parsed.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib").unshift("../../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
 require 'puppettest/fileparsing'