Making sure that the svn bin directory is at the beginning of PATH, rather that at the end, so the svn-versions of the exes are being tested.

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

2 files changed, 4 insertions, 2 deletions

diff --git a/test/executables/puppetca.rb b/test/executables/puppetca.rb
index 71764ebd2..d21e94e7a 100755
--- a/test/executables/puppetca.rb
+++ b/test/executables/puppetca.rb
@@ -85,6 +85,8 @@ class TestPuppetCA < Test::Unit::TestCase
         assert_equal(["No certificates to sign"], output)
     end
     
+    # This method takes a long time to run because of all of the external
+    # executable calls.
     def test_revocation
         ca = Puppet::SSLCertificates::CA.new()
         host1 = gen_cert(ca, "host1.example.com")
diff --git a/test/puppettest.rb b/test/puppettest.rb
index d5c1e440d..9ff8e5c46 100644
--- a/test/puppettest.rb
+++ b/test/puppettest.rb
@@ -524,8 +524,8 @@ module ExeTest
     end
 
     def setbindir
-        unless ENV["PATH"] =~ /puppet/
-            ENV["PATH"] += ":" + bindir
+        unless ENV["PATH"].split(":").include?(bindir)
+            ENV["PATH"] = [bindir, ENV["PATH"]].join(":")
         end
     end