[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

[Nick Lewis]

The following commit has been merged in the experimental branch:
commit c1d7881c9255d6470fda7c27e800b4caa061b7c0
Merge: 026eba3a7b568e6ef7c8ea8032ea49c65dfd8295 9c0e55b43f6db69f060d54c894f2303ecbbe04e3
Author: Nick Lewis <nick at puppetlabs.com>
Date:   Tue Mar 1 12:32:31 2011 -0800

    Merge branch 'ticket/next/5496' into next

diff --combined spec/unit/provider/zpool/solaris_spec.rb
index 805dd54,f15b7d1..e2a0e16
--- a/spec/unit/provider/zpool/solaris_spec.rb
+++ b/spec/unit/provider/zpool/solaris_spec.rb
@@@ -1,6 -1,6 +1,6 @@@
  #!/usr/bin/env ruby
  
 -require File.dirname(__FILE__) + '/../../../spec_helper'
 +require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
  
  provider_class = Puppet::Type.type(:zpool).provider(:solaris)
  
@@@ -76,6 -76,13 +76,13 @@@ describe provider_class d
        end
      end
  
+     describe "when the vdev is a single mirror on solaris 10u9 or later" do
+       it "should call create_multi_array with mirror" do
+         @zpool_data = ["mirrorpool", "mirror-0", "disk1", "disk2"]
+         @provider.process_zpool_data(@zpool_data)[:mirror].should == ["disk1 disk2"]
+       end
+     end
+ 
      describe "when the vdev is a double mirror" do
        it "should call create_multi_array with mirror" do
          @zpool_data = ["mirrorpool", "mirror", "disk1", "disk2", "mirror", "disk3", "disk4"]
@@@ -83,6 -90,13 +90,13 @@@
        end
      end
  
+     describe "when the vdev is a double mirror on solaris 10u9 or later" do
+       it "should call create_multi_array with mirror" do
+         @zpool_data = ["mirrorpool", "mirror-0", "disk1", "disk2", "mirror-1", "disk3", "disk4"]
+         @provider.process_zpool_data(@zpool_data)[:mirror].should == ["disk1 disk2", "disk3 disk4"]
+       end
+     end
+ 
      describe "when the vdev is a raidz1" do
        it "should call create_multi_array with raidz1" do
          @zpool_data = ["mirrorpool", "raidz1", "disk1", "disk2"]
@@@ -90,6 -104,13 +104,13 @@@
        end
      end
  
+     describe "when the vdev is a raidz1 on solaris 10u9 or later" do
+       it "should call create_multi_array with raidz1" do
+         @zpool_data = ["mirrorpool", "raidz1-0", "disk1", "disk2"]
+         @provider.process_zpool_data(@zpool_data)[:raidz].should == ["disk1 disk2"]
+       end
+     end
+ 
      describe "when the vdev is a raidz2" do
        it "should call create_multi_array with raidz2 and set the raid_parity" do
          @zpool_data = ["mirrorpool", "raidz2", "disk1", "disk2"]
@@@ -98,6 -119,15 +119,15 @@@
          pool[:raid_parity].should == "raidz2"
        end
      end
+ 
+     describe "when the vdev is a raidz2 on solaris 10u9 or later" do
+       it "should call create_multi_array with raidz2 and set the raid_parity" do
+         @zpool_data = ["mirrorpool", "raidz2-0", "disk1", "disk2"]
+         pool = @provider.process_zpool_data(@zpool_data)
+         pool[:raidz].should == ["disk1 disk2"]
+         pool[:raid_parity].should == "raidz2"
+       end
+     end
    end
  
    describe "when calling the getters and setters" do

-- 
Puppet packaging for Debian