← Back to branch summary

~ubuntu-branches/ubuntu/quantal/puppet/quantal

« back to all changes in this revision

Viewing changes to spec/unit/type_spec.rb

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-07-14 01:56:30 UTC
  • mfrom: (1.1.29) (3.1.43 sid)
  • Revision ID: package-import@ubuntu.com-20120714015630-ntj41rkvkq4zph4y
Tags: 2.7.18-1ubuntu1
https://launchpad.net/bugs/1023931
* Resynchronise with Debian. (LP: #1023931) Remaining changes:
  - debian/puppetmaster-passenger.postinst: Make sure we error if puppet
    config print doesn't work
  - debian/puppetmaster-passenger.postinst: Ensure upgrades from
    <= 2.7.11-1 fixup passenger apache configuration.
* Dropped upstreamed patches:
  - debian/patches/CVE-2012-1906_CVE-2012-1986_to_CVE-2012-1989.patch
  - debian/patches/puppet-12844
  - debian/patches/2.7.17-Puppet-July-2012-CVE-fixes.patch
* Drop Build-Depends on ruby-rspec (in universe):
  - debian/control: remove ruby-rspec from Build-Depends
  - debian/patches/no-rspec.patch: make Rakefile work anyway if rspec
    isn't installed so we can use it in debian/rules.

Show diffs side-by-side

added added

removed removed

Lines of Context:
spec/unit/type_spec.rb
611
611
    end
612
612
  end
613
613
 
 
614
  describe "::instances" do
 
615
    it "should not fail if no suitable providers are found" do
 
616
      fake_type = Puppet::Type.newtype(:type_spec_fake_type) do
 
617
        newparam(:name) do
 
618
          isnamevar
 
619
        end
 
620
        newproperty(:prop1) do
 
621
        end
 
622
 
 
623
        provide(:fake1) do
 
624
          confine :exists => '/no/such/file'
 
625
          mk_resource_methods
 
626
        end
 
627
      end
 
628
 
 
629
      expect { fake_type.instances }.should_not raise_error
 
630
    end
 
631
  end
 
632
 
 
633
 
614
634
  describe "::ensurable?" do
615
635
    before :each do
616
636
      class TestEnsurableType < Puppet::Type