diff options
Diffstat (limited to 'test/lib/puppettest.rb')
| -rwxr-xr-x | test/lib/puppettest.rb | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb index 07e3e084e..05d59a3a7 100755 --- a/test/lib/puppettest.rb +++ b/test/lib/puppettest.rb @@ -109,23 +109,16 @@ module PuppetTest Puppet::Log.close Puppet::Log.newdestination tempfile() Puppet[:httplog] = tempfile() - else + else + if textmate? + Puppet[:color] = false + end Puppet::Log.newdestination :console Puppet::Log.level = :debug #$VERBOSE = 1 Puppet.info @method_name Puppet[:trace] = true end - #if $0 =~ /.+\.rb/ or Puppet[:debug] - # Puppet::Log.newdestination :console - # Puppet::Log.level = :debug - # #$VERBOSE = 1 - # Puppet.info @method_name - #else - # Puppet::Log.close - # Puppet::Log.newdestination tempfile() - # Puppet[:httplog] = tempfile() - #end Puppet[:ignoreschedules] = true end @@ -142,6 +135,14 @@ module PuppetTest @@tmpfiles << f return f end + + def textmate? + if ENV["TM_FILENAME"] + return true + else + return false + end + end def tstdir dir = tempfile() |