diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-10-17 15:12:48 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-10-17 15:12:48 +0000 |
| commit | 0472b2410225927226272c5ecc14d1ab6cdb9f09 (patch) | |
| tree | 2d2c2fac46b2b155f5ae011e381c80f52ab209d4 /test/lib | |
| parent | 5ddbc3659d4a46bd9a688702668df0301d57ade1 (diff) | |
| download | puppet-0472b2410225927226272c5ecc14d1ab6cdb9f09.tar.gz puppet-0472b2410225927226272c5ecc14d1ab6cdb9f09.tar.xz puppet-0472b2410225927226272c5ecc14d1ab6cdb9f09.zip | |
First batch of fixes from running tests.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1797 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test/lib')
| -rwxr-xr-x | test/lib/puppettest.rb | 2 | ||||
| -rw-r--r-- | test/lib/puppettest/reporttesting.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb index 55a502b8c..de2747336 100755 --- a/test/lib/puppettest.rb +++ b/test/lib/puppettest.rb @@ -132,7 +132,7 @@ module PuppetTest @@tmpfilenum = 1 end - f = File.join(self.tmpdir(), self.class.to_s + "_" + @method_name + + f = File.join(self.tmpdir(), self.class.to_s + "_" + @method_name.to_s + @@tmpfilenum.to_s) @@tmpfiles << f return f diff --git a/test/lib/puppettest/reporttesting.rb b/test/lib/puppettest/reporttesting.rb index fa9937ab9..67d715d4a 100644 --- a/test/lib/puppettest/reporttesting.rb +++ b/test/lib/puppettest/reporttesting.rb @@ -4,7 +4,8 @@ module PuppetTest::Reporttesting report = Puppet::Transaction::Report.new 3.times { |i| - log = Puppet.info("Report test message %s" % i) + # We have to use warning so that the logs always happen + log = Puppet.warning("Report test message %s" % i) log.tags = %w{a list of tags} log.tags << "tag%s" % i |