← Back to branch summary

~nvalcarcel/ubuntu/lucid/puppet/fix-546677

« back to all changes in this revision

Viewing changes to test/util/log.rb

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2009-12-23 00:48:10 UTC
  • mfrom: (1.1.10 upstream) (3.1.7 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091223004810-3i4oryds922g5n59
Tags: 0.25.1-3ubuntu1
* Merge from debian testing.  Remaining changes:
  - debian/rules:
    + Don't start puppet when first installing puppet.
  - debian/puppet.conf, lib/puppet/defaults.rb:
    + Move templates to /etc/puppet
  - lib/puppet/defaults.rb:
    + Fix /var/lib/puppet/state ownership.
  - man/man8/puppet.conf.8: 
    + Fix broken URL in manpage.
  - debian/control:
    + Update maintainer accordint to spec.
    + Puppetmaster Recommends -> Suggests
    + Created puppet-testsuite as a seperate. Allow the users to run puppet's 
      testsuite.
  - tests/Rakefile: Fix rakefile so that the testsuite can acutally be ran.

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/util/log.rb
129
129
    # Verify that the error and source are always strings
130
130
    def test_argsAreStrings
131
131
        msg = nil
132
 
        file = Puppet.type(:file).create(
 
132
        file = Puppet::Type.type(:file).new(
133
133
            :path => tempfile(),
134
134
            :check => %w{owner group}
135
135
        )
195
195
        Puppet.warning "A test"
196
196
        assert(File.read(file) =~ /A test/,
197
197
            "File did not flush")
198
 
        # Rename the file 
 
198
        # Rename the file
199
199
        newfile = file + ".old"
200
200
        File.rename(file, newfile)
201
201