summaryrefslogtreecommitdiffstats
path: root/test/executables/puppetca.rb
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-01-10 00:10:14 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-01-10 00:10:14 +0000
commite5ac19668867a8adeb18066bdd1d3e201e38211c (patch)
tree64c599f45ff10ba39caf7adeef0ee8afd651373a /test/executables/puppetca.rb
parentdccafc7e950d9111a0a4c11afebd89e1ede5e414 (diff)
downloadpuppet-e5ac19668867a8adeb18066bdd1d3e201e38211c.tar.gz
puppet-e5ac19668867a8adeb18066bdd1d3e201e38211c.tar.xz
puppet-e5ac19668867a8adeb18066bdd1d3e201e38211c.zip
Adding some consistencies to the executable tests. All exe tests now pass on OpenBSD, although the only real problem was that ruby was in /usr/local/bin.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@795 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test/executables/puppetca.rb')
-rwxr-xr-xtest/executables/puppetca.rb15
1 files changed, 3 insertions, 12 deletions
diff --git a/test/executables/puppetca.rb b/test/executables/puppetca.rb
index 819ecf702..b69edb314 100755
--- a/test/executables/puppetca.rb
+++ b/test/executables/puppetca.rb
@@ -10,19 +10,8 @@ require 'puppet/sslcertificates'
require 'test/unit'
require 'puppettest.rb'
-# $Id$
-
-# ok, we have to add the bin directory to our search path
-ENV["PATH"] += ":" + File.join($puppetbase, "bin")
-
-# and then the library directories
-libdirs = $:.find_all { |dir|
- dir =~ /puppet/ or dir =~ /\.\./
-}
-ENV["RUBYLIB"] = libdirs.join(":")
-
class TestPuppetCA < Test::Unit::TestCase
- include ServerTest
+ include ExeTest
def mkcert(hostname)
cert = nil
assert_nothing_raised {
@@ -77,3 +66,5 @@ class TestPuppetCA < Test::Unit::TestCase
assert_equal([], output)
end
end
+
+# $Id$