[prev in list] [next in list] [prev in thread] [next in thread] 

List:       puppet-commit
Subject:    [Puppet-commit] puppet revision 1999
From:       svn () madstop ! com
Date:       2006-12-31 2:58:55
Message-ID: 20061231025855.68F4516F36B () culain ! madstop ! com
[Download RAW message or body]

mpalmer 2006-12-30 20:58:55 -0600 (Sat, 30 Dec 2006)
Add system library directories directly in puppettest.rb, so you don't have to do it \
by hand in every single underlying directory; also change the debug check slightly so \
                that we actually put debug stuff only when we really want it
Modified: trunk/test/lib/puppettest.rb
===================================================================
--- trunk/test/lib/puppettest.rb	2006-12-30 23:31:27 UTC (rev 1998)
+++ trunk/test/lib/puppettest.rb	2006-12-31 02:58:55 UTC (rev 1999)
@@ -1,3 +1,8 @@
+# Add .../test/lib
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
+# Add .../lib
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '../../lib')))
+
 require 'puppet'
 require 'test/unit'
 
@@ -103,7 +108,7 @@
         @@cleaners = []
 
         # If we're running under rake, then disable debugging and such.
-        if rake? and ! Puppet[:debug]
+        if rake? or ! Puppet[:debug]
             Puppet::Log.close
             Puppet::Log.newdestination tempfile()
             Puppet[:httplog] = tempfile()


[Attachment #3 (text/html)]

<p><b>mpalmer</b> 2006-12-30 20:58:55 -0600 (Sat, 30 Dec 2006)</p><p>Add system \
library directories directly in puppettest.rb, so you don't have to do it by hand in \
every single underlying directory; also change the debug check slightly so that we \
actually put debug stuff only when we really want it<br> </p><hr noshade><pre><font \
color="gray">Modified: trunk/test/lib/puppettest.rb \
                ===================================================================
--- trunk/test/lib/puppettest.rb	2006-12-30 23:31:27 UTC (rev 1998)
+++ trunk/test/lib/puppettest.rb	2006-12-31 02:58:55 UTC (rev 1999)
@@ -1,3 +1,8 @@
+# Add .../test/lib
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
+# Add .../lib
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '../../lib')))
+
 require 'puppet'
 require 'test/unit'
 
@@ -103,7 +108,7 @@
         @@cleaners = []
 
         # If we're running under rake, then disable debugging and such.
-        if rake? and ! Puppet[:debug]
+        if rake? or ! Puppet[:debug]
             Puppet::Log.close
             Puppet::Log.newdestination tempfile()
             Puppet[:httplog] = tempfile()

</font>
</pre>



[prev in list] [next in list] [prev in thread] [next in thread]