← Back to branch summary

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

« back to all changes in this revision

Viewing changes to test/ral/providers/mailalias/aliases.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/ral/providers/mailalias/aliases.rb
6
6
require 'puppettest/fileparsing'
7
7
 
8
8
class TestMailaliasAliasesProvider < Test::Unit::TestCase
9
 
        include PuppetTest
10
 
        include PuppetTest::FileParsing
 
9
    include PuppetTest
 
10
    include PuppetTest::FileParsing
11
11
 
12
12
    def setup
13
13
        super
14
 
        @provider = Puppet.type(:mailalias).provider(:aliases)
 
14
        @provider = Puppet::Type.type(:mailalias).provider(:aliases)
15
15
 
16
16
        @oldfiletype = @provider.filetype
17
17
 
24
24
        @provider.clear
25
25
        super
26
26
    end
27
 
    
 
27
 
28
28
    def mkalias(name = "me")
29
29
        if defined? @pcount
30
30
            @pcount += 1