summaryrefslogtreecommitdiffstats
path: root/test/ral/manager
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-10-26 11:26:57 -0500
committerLuke Kanies <luke@madstop.com>2007-10-26 11:26:57 -0500
commitd03f68eaed6d05483128b495ad1faaf89208d66a (patch)
tree3883c1dfb9ab8b1d4eed37eda13f7bb64ee851b8 /test/ral/manager
parentc0a07ac724c27fce8d2673e4466e42d46d68f145 (diff)
downloadpuppet-d03f68eaed6d05483128b495ad1faaf89208d66a.tar.gz
puppet-d03f68eaed6d05483128b495ad1faaf89208d66a.tar.xz
puppet-d03f68eaed6d05483128b495ad1faaf89208d66a.zip
Changing the test/ classes so that they work from the main
test/ dir or from their own working dir, like the specs do. This was just a question of changing how their libraries are loaded.
Diffstat (limited to 'test/ral/manager')
-rwxr-xr-xtest/ral/manager/attributes.rb2
-rwxr-xr-xtest/ral/manager/instances.rb2
-rwxr-xr-xtest/ral/manager/manager.rb2
-rwxr-xr-xtest/ral/manager/provider.rb2
-rwxr-xr-xtest/ral/manager/type.rb2
5 files changed, 5 insertions, 5 deletions
diff --git a/test/ral/manager/attributes.rb b/test/ral/manager/attributes.rb
index 28cb07f69..e2a61f447 100755
--- a/test/ral/manager/attributes.rb
+++ b/test/ral/manager/attributes.rb
@@ -3,7 +3,7 @@
# Created by Luke A. Kanies on 2007-02-05.
# Copyright (c) 2007. All rights reserved.
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
require 'puppettest'
require 'mocha'
diff --git a/test/ral/manager/instances.rb b/test/ral/manager/instances.rb
index 14b85f95d..6ac4322f5 100755
--- a/test/ral/manager/instances.rb
+++ b/test/ral/manager/instances.rb
@@ -3,7 +3,7 @@
# Created by Luke A. Kanies on 2007-06-10.
# Copyright (c) 2007. All rights reserved.
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
require 'puppettest'
diff --git a/test/ral/manager/manager.rb b/test/ral/manager/manager.rb
index 4f2ade4e9..8f7e74d4d 100755
--- a/test/ral/manager/manager.rb
+++ b/test/ral/manager/manager.rb
@@ -3,7 +3,7 @@
# Created by Luke A. Kanies on 2006-11-29.
# Copyright (c) 2006. All rights reserved.
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
require 'puppettest'
diff --git a/test/ral/manager/provider.rb b/test/ral/manager/provider.rb
index 0aeac357f..bb7a21485 100755
--- a/test/ral/manager/provider.rb
+++ b/test/ral/manager/provider.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
require 'puppettest'
require 'mocha'
diff --git a/test/ral/manager/type.rb b/test/ral/manager/type.rb
index b2c111e60..57248159b 100755
--- a/test/ral/manager/type.rb
+++ b/test/ral/manager/type.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
require 'puppettest'
require 'mocha'