← Back to branch summary

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

« back to all changes in this revision

Viewing changes to test/lib/puppettest/railstesting.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/lib/puppettest/railstesting.rb
26
26
    def railsresource(type = "file", title = "/tmp/testing", params = {})
27
27
        railsteardown
28
28
        railsinit
29
 
        
 
29
 
30
30
        # We need a host for resources
31
31
        #host = Puppet::Rails::Host.new(:name => Facter.value("hostname"))
32
32
 
39
39
        facts = Facter.to_hash
40
40
 
41
41
        # Now try storing our crap
42
 
        host = nil 
 
42
        host = nil
43
43
        node = mknode(facts["hostname"])
44
44
        node.parameters = facts
45
45
        assert_nothing_raised {
46
46
            host = Puppet::Rails::Host.store(node, resources)
47
 
        }        
 
47
        }
48
48
 
49
49
        # Now save the whole thing
50
50
        host.save