puppet 2.7.26 → 3.0.0.rc4

data/spec/unit/type/filebucket_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 describe Puppet::Type.type(:filebucket) do

data/spec/unit/type/group_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 describe Puppet::Type.type(:group) do
@@ -32,12 +32,12 @@ describe Puppet::Type.type(:group) do
     end
   end
 
-  it "should have a boolean method for determining if duplicates are allowed", :'fails_on_ruby_1.9.2' => true do
-    @class.new(:name => "foo").methods.should be_include("allowdupe?")
+  it "should have a boolean method for determining if duplicates are allowed" do
+    @class.new(:name => "foo").must respond_to "allowdupe?"
   end
 
-  it "should have a boolean method for determining if system groups are allowed", :'fails_on_ruby_1.9.2' => true do
-    @class.new(:name => "foo").methods.should be_include("system?")
+  it "should have a boolean method for determining if system groups are allowed" do
+    @class.new(:name => "foo").must respond_to "system?"
   end
 
   it "should call 'create' to create the group" do

data/spec/unit/type/host_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 host = Puppet::Type.type(:host)

data/spec/unit/type/interface_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 describe Puppet::Type.type(:interface) do

data/spec/unit/type/macauthorization_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 macauth_type = Puppet::Type.type(:macauthorization)

data/spec/unit/type/mailalias_spec.rb

@@ -0,0 +1,21 @@
+#! /usr/bin/env ruby -S rspec
+require 'spec_helper'
+
+describe Puppet::Type.type(:mailalias) do
+  include PuppetSpec::Files
+
+  let :target do tmpfile('mailalias') end
+  let :resource do
+    described_class.new(:name => "luke", :recipient => "yay", :target => target)
+  end
+
+  it "should be initially absent" do
+    resource.retrieve_resource[:recipient].should == :absent
+  end
+
+  it "should try and set the recipient when it does the sync" do
+    resource.retrieve_resource[:recipient].should == :absent
+    resource.property(:recipient).expects(:set).with(["yay"])
+    resource.property(:recipient).sync
+  end
+end

data/spec/unit/type/maillist_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 maillist = Puppet::Type.type(:maillist)

data/spec/unit/type/mcx_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/type/mcx'

data/spec/unit/type/mount_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 describe Puppet::Type.type(:mount), :unless => Puppet.features.microsoft_windows? do
@@ -67,7 +67,7 @@ describe Puppet::Type.type(:mount)::Ensure, :unless => Puppet.features.microsoft
     provider_properties = {}
     @provider = stub 'provider', :class => Puppet::Type.type(:mount).defaultprovider, :clear => nil, :satisfies? => true, :name => :mock, :property_hash => provider_properties
     Puppet::Type.type(:mount).defaultprovider.stubs(:new).returns(@provider)
-    @mount = Puppet::Type.type(:mount).new(:name => "yay", :check => :ensure)
+    @mount = Puppet::Type.type(:mount).new(:name => "yay", :audit => :ensure)
 
     @ensure = @mount.property(:ensure)
   end

data/spec/unit/type/nagios_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/external/nagios'

data/spec/unit/type/noop_metaparam_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/type'
@@ -21,8 +21,8 @@ describe Puppet::Type.type(:file).attrclass(:noop) do
 
   describe "when set on a resource" do
     it "should default to the :noop setting" do
-      Puppet.settings.expects(:value).with(:noop).returns "myval"
-      @file.noop.should == "myval"
+      Puppet[:noop] = true
+      @file.noop.should == true
     end
 
     it "should prefer true values from the attribute" do

data/spec/unit/type/package_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 describe Puppet::Type.type(:package) do

data/spec/unit/type/resources_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 resources = Puppet::Type.type(:resources)
@@ -51,7 +51,7 @@ describe resources do
           @resources.generate.collect { |r| r.ref }.should_not include(@host1.ref)
         end
 
-        it "should not include the skipped system users", :'fails_on_ruby_1.9.2' => true do
+        it "should not include the skipped system users" do
           res = Puppet::Type.type(:resources).new :name => :user, :purge => true
           res.catalog = Puppet::Resource::Catalog.new
 

data/spec/unit/type/schedule_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 module ScheduleTesting
@@ -23,6 +23,7 @@ module ScheduleTesting
 end
 
 describe Puppet::Type.type(:schedule) do
+  include ScheduleTesting
   before :each do
     Puppet[:ignoreschedules] = false
 
@@ -30,8 +31,6 @@ describe Puppet::Type.type(:schedule) do
   end
 
   describe Puppet::Type.type(:schedule) do
-    include ScheduleTesting
-
     it "should apply to device" do
       @schedule.must be_appliable_to_device
     end
@@ -55,8 +54,6 @@ describe Puppet::Type.type(:schedule) do
   end
 
   describe Puppet::Type.type(:schedule), "when producing default schedules" do
-    include ScheduleTesting
-
     %w{hourly daily weekly monthly never}.each do |period|
       period = period.to_sym
       it "should produce a #{period} schedule with the period set appropriately" do
@@ -74,8 +71,6 @@ describe Puppet::Type.type(:schedule) do
   end
 
   describe Puppet::Type.type(:schedule), "when matching ranges" do
-    include ScheduleTesting
-
     before do
       Time.stubs(:now).returns(Time.local(2011, "may", 23, 11, 0, 0))
     end
@@ -95,12 +90,6 @@ describe Puppet::Type.type(:schedule) do
       @schedule.must_not be_match
     end
 
-    it "should throw an error if the upper limit is less than the lower limit" do
-      pending "bug #7639"
-      @schedule[:range] = "01:02:03 - 01:00:00"
-      @schedule.must_throw Puppet::Error
-    end
-
     it "should not match the current time fails between an array of ranges" do
       @schedule[:range] = ["4-6", "20-23"]
       @schedule.must_not be_match
@@ -117,9 +106,151 @@ describe Puppet::Type.type(:schedule) do
     end
   end
 
-  describe Puppet::Type.type(:schedule), "when matching hourly by distance", :'fails_on_ruby_1.9.2' => true do
-    include ScheduleTesting
+  describe Puppet::Type.type(:schedule), "when matching ranges with abbreviated time specifications" do
+    before do
+      Time.stubs(:now).returns(Time.local(2011, "may", 23, 11, 45, 59))
+    end
+
+    it "should match when just an hour is specified" do
+      @schedule[:range] = "11-12"
+      @schedule.must be_match
+    end
+
+    it "should not match when the ending hour is the current hour" do
+      @schedule[:range] = "10-11"
+      @schedule.must_not be_match
+    end
+
+    it "should not match when the ending minute is the current minute" do
+      @schedule[:range] = "10:00 - 11:45"
+      @schedule.must_not be_match
+    end
+  end
+
+  describe Puppet::Type.type(:schedule), "when matching ranges with abbreviated time specifications, edge cases part 1" do
+    before do
+      Time.stubs(:now).returns(Time.local(2011, "may", 23, 11, 00, 00))
+    end
+
+    it "should match when the current time is the start of the range using hours" do
+      @schedule[:range] = "11 - 12"
+      @schedule.must be_match
+    end
+
+    it "should match when the current time is the end of the range using hours" do
+      @schedule[:range] = "10 - 11"
+      @schedule.must be_match
+    end
+
+    it "should match when the current time is the start of the range using hours and minutes" do
+      @schedule[:range] = "11:00 - 12:00"
+      @schedule.must be_match
+    end
+
+    it "should match when the current time is the end of the range using hours and minutes" do
+      @schedule[:range] = "10:00 - 11:00"
+      @schedule.must be_match
+    end
+  end
+
+  describe Puppet::Type.type(:schedule), "when matching ranges with abbreviated time specifications, edge cases part 2" do
+    before do
+      Time.stubs(:now).returns(Time.local(2011, "may", 23, 11, 00, 01))
+    end
+
+    it "should match when the current time is just past the start of the range using hours" do
+      @schedule[:range] = "11 - 12"
+      @schedule.must be_match
+    end
+
+    it "should not match when the current time is just past the end of the range using hours" do
+      @schedule[:range] = "10 - 11"
+      @schedule.must_not be_match
+    end
+
+    it "should match when the current time is just past the start of the range using hours and minutes" do
+      @schedule[:range] = "11:00 - 12:00"
+      @schedule.must be_match
+    end
+
+    it "should not match when the current time is just past the end of the range using hours and minutes" do
+      @schedule[:range] = "10:00 - 11:00"
+      @schedule.must_not be_match
+    end
+  end
+
+  describe Puppet::Type.type(:schedule), "when matching ranges with abbreviated time specifications, edge cases part 3" do
+    before do
+      Time.stubs(:now).returns(Time.local(2011, "may", 23, 10, 59, 59))
+    end
+
+    it "should not match when the current time is just before the start of the range using hours" do
+      @schedule[:range] = "11 - 12"
+      @schedule.must_not be_match
+    end
+
+    it "should match when the current time is just before the end of the range using hours" do
+      @schedule[:range] = "10 - 11"
+      @schedule.must be_match
+    end
+
+    it "should not match when the current time is just before the start of the range using hours and minutes" do
+      @schedule[:range] = "11:00 - 12:00"
+      @schedule.must_not be_match
+    end
+
+    it "should match when the current time is just before the end of the range using hours and minutes" do
+      @schedule[:range] = "10:00 - 11:00"
+      @schedule.must be_match
+    end
+  end
+
+  describe Puppet::Type.type(:schedule), "when matching ranges spanning days, day 1" do
+    before do
+      # Test with the current time at a month's end boundary to ensure we are
+      # advancing the day properly when we push the ending limit out a day.
+      # For example, adding 1 to 31 would throw an error instead of advancing
+      # the date.
+      Time.stubs(:now).returns(Time.local(2011, "mar", 31, 22, 30, 0))
+    end
+
+    it "should match when the start time is before current time and the end time is the following day" do
+      @schedule[:range] = "22:00:00 - 02:00:00"
+      @schedule.must be_match
+    end
+
+    it "should not match when the current time is outside the range" do
+      @schedule[:range] = "23:30:00 - 21:00:00"
+      @schedule.must_not be_match
+    end
+  end
+
+  describe Puppet::Type.type(:schedule), "when matching ranges spanning days, day 2" do
+    before do
+      # Test with the current time at a month's end boundary to ensure we are
+      # advancing the day properly when we push the ending limit out a day.
+      # For example, adding 1 to 31 would throw an error instead of advancing
+      # the date.
+      Time.stubs(:now).returns(Time.local(2011, "mar", 31, 1, 30, 0))
+    end
+
+    it "should match when the start time is the day before the current time and the end time is after the current time" do
+      @schedule[:range] = "22:00:00 - 02:00:00"
+      @schedule.must be_match
+    end
+
+    it "should not match when the start time is after the current time" do
+      @schedule[:range] = "02:00:00 - 00:30:00"
+      @schedule.must_not be_match
+    end
 
+    it "should not match when the end time is before the current time" do
+      @schedule[:range] = "22:00:00 - 01:00:00"
+      @schedule.must_not be_match
+    end
+  end
+
+  describe Puppet::Type.type(:schedule), "when matching hourly by distance" do
     before do
       @schedule[:period] = :hourly
       @schedule[:periodmatch] = :distance
@@ -140,9 +271,7 @@ describe Puppet::Type.type(:schedule) do
     end
   end
 
-  describe Puppet::Type.type(:schedule), "when matching daily by distance", :'fails_on_ruby_1.9.2' => true do
-    include ScheduleTesting
-
+  describe Puppet::Type.type(:schedule), "when matching daily by distance" do
     before do
       @schedule[:period] = :daily
       @schedule[:periodmatch] = :distance
@@ -163,9 +292,7 @@ describe Puppet::Type.type(:schedule) do
     end
   end
 
-  describe Puppet::Type.type(:schedule), "when matching weekly by distance", :'fails_on_ruby_1.9.2' => true do
-    include ScheduleTesting
-
+  describe Puppet::Type.type(:schedule), "when matching weekly by distance" do
     before do
       @schedule[:period] = :weekly
       @schedule[:periodmatch] = :distance
@@ -186,9 +313,7 @@ describe Puppet::Type.type(:schedule) do
     end
   end
 
-  describe Puppet::Type.type(:schedule), "when matching monthly by distance", :'fails_on_ruby_1.9.2' => true do
-    include ScheduleTesting
-
+  describe Puppet::Type.type(:schedule), "when matching monthly by distance" do
     before do
       @schedule[:period] = :monthly
       @schedule[:periodmatch] = :distance
@@ -209,9 +334,7 @@ describe Puppet::Type.type(:schedule) do
     end
   end
 
-  describe Puppet::Type.type(:schedule), "when matching hourly by number", :'fails_on_ruby_1.9.2' => true do
-    include ScheduleTesting
-
+  describe Puppet::Type.type(:schedule), "when matching hourly by number" do
     before do
       @schedule[:period] = :hourly
       @schedule[:periodmatch] = :number
@@ -234,9 +357,7 @@ describe Puppet::Type.type(:schedule) do
     end
   end
 
-  describe Puppet::Type.type(:schedule), "when matching daily by number", :'fails_on_ruby_1.9.2' => true do
-    include ScheduleTesting
-
+  describe Puppet::Type.type(:schedule), "when matching daily by number" do
     before do
       @schedule[:period] = :daily
       @schedule[:periodmatch] = :number
@@ -265,9 +386,7 @@ describe Puppet::Type.type(:schedule) do
     end
   end
 
-  describe Puppet::Type.type(:schedule), "when matching weekly by number", :'fails_on_ruby_1.9.2' => true do
-    include ScheduleTesting
-
+  describe Puppet::Type.type(:schedule), "when matching weekly by number" do
     before do
       @schedule[:period] = :weekly
       @schedule[:periodmatch] = :number
@@ -290,9 +409,7 @@ describe Puppet::Type.type(:schedule) do
     end
   end
 
-  describe Puppet::Type.type(:schedule), "when matching monthly by number", :'fails_on_ruby_1.9.2' => true do
-    include ScheduleTesting
-
+  describe Puppet::Type.type(:schedule), "when matching monthly by number" do
     before do
       @schedule[:period] = :monthly
       @schedule[:periodmatch] = :number
@@ -315,9 +432,7 @@ describe Puppet::Type.type(:schedule) do
     end
   end
 
-  describe Puppet::Type.type(:schedule), "when matching with a repeat greater than one", :'fails_on_ruby_1.9.2' => true do
-    include ScheduleTesting
-
+  describe Puppet::Type.type(:schedule), "when matching with a repeat greater than one" do
     before do
       @schedule[:period] = :daily
       @schedule[:repeat] = 2
@@ -340,4 +455,147 @@ describe Puppet::Type.type(:schedule) do
       @schedule.must_not be_match(previous)
     end
   end
+
+  describe Puppet::Type.type(:schedule), "when matching days of the week" do
+    before do
+      # 2011-05-23 is a Monday
+      Time.stubs(:now).returns(Time.local(2011, "may", 23, 11, 0, 0))
+    end
+
+    it "should raise an error if the weekday is 'Someday'" do
+      proc { @schedule[:weekday] = "Someday" }.should raise_error(Puppet::Error)
+    end
+
+    it "should raise an error if the weekday is '7'" do
+      proc { @schedule[:weekday] = "7" }.should raise_error(Puppet::Error)
+    end
+
+    it "should accept all full weekday names as valid values" do
+      proc { @schedule[:weekday] = ['Sunday', 'Monday', 'Tuesday', 'Wednesday',
+          'Thursday', 'Friday', 'Saturday'] }.should_not raise_error
+    end
+
+    it "should accept all short weekday names as valid values" do
+      proc { @schedule[:weekday] = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu',
+          'Fri', 'Sat'] }.should_not raise_error
+    end
+
+    it "should match if the weekday is 'Monday'" do
+      @schedule[:weekday] = "Monday"
+      @schedule.match?.should be_true
+    end
+
+    it "should match if the weekday is 'Mon'" do
+      @schedule[:weekday] = "Mon"
+      @schedule.match?.should be_true
+    end
+
+    it "should match if the weekday is '1'" do
+      @schedule[:weekday] = "1"
+      @schedule.match?.should be_true
+    end
+
+    it "should not match if the weekday is Tuesday" do
+      @schedule[:weekday] = "Tuesday"
+      @schedule.should_not be_match
+    end
+
+    it "should match if weekday is ['Sun', 'Mon']" do
+      @schedule[:weekday] = ["Sun", "Mon"]
+      @schedule.match?.should be_true
+    end
+
+    it "should not match if weekday is ['Sun', 'Tue']" do
+      @schedule[:weekday] = ["Sun", "Tue"]
+      @schedule.should_not be_match
+    end
+
+    it "should match if the weekday is 'Monday'" do
+      @schedule[:weekday] = "Monday"
+      @schedule.match?.should be_true
+    end
+
+    it "should match if the weekday is 'Mon'" do
+      @schedule[:weekday] = "Mon"
+      @schedule.match?.should be_true
+    end
+
+    it "should match if the weekday is '1'" do
+      @schedule[:weekday] = "1"
+      @schedule.match?.should be_true
+    end
+
+    it "should not match if the weekday is Tuesday" do
+      @schedule[:weekday] = "Tuesday"
+      @schedule.should_not be_match
+    end
+
+    it "should match if weekday is ['Sun', 'Mon']" do
+      @schedule[:weekday] = ["Sun", "Mon"]
+      @schedule.match?.should be_true
+    end
+  end
+
+  describe Puppet::Type.type(:schedule), "when matching days of week and ranges spanning days, day 1" do
+    before do
+      # Test with ranges and days-of-week both set. 2011-03-31 was a Thursday.
+      Time.stubs(:now).returns(Time.local(2011, "mar", 31, 22, 30, 0))
+    end
+
+    it "should match when the range and day of week matches" do
+      @schedule[:range] = "22:00:00 - 02:00:00"
+      @schedule[:weekday] = "Thursday"
+      @schedule.must be_match
+    end
+
+    it "should not match when the range doesn't match even if the day-of-week matches" do
+      @schedule[:range] = "23:30:00 - 21:00:00"
+      @schedule[:weekday] = "Thursday"
+      @schedule.must_not be_match
+    end
+
+    it "should not match when day-of-week doesn't match even if the range matches (1 day later)" do
+      @schedule[:range] = "22:00:00 - 01:00:00"
+      @schedule[:weekday] = "Friday"
+      @schedule.must_not be_match
+    end
+
+    it "should not match when day-of-week doesn't match even if the range matches (1 day earlier)" do
+      @schedule[:range] = "22:00:00 - 01:00:00"
+      @schedule[:weekday] = "Wednesday"
+      @schedule.must_not be_match
+    end
+  end
+
+  describe Puppet::Type.type(:schedule), "when matching days of week and ranges spanning days, day 2" do
+    before do
+      # 2011-03-31 was a Thursday. As the end-time of a day spanning match, that means
+      # we need to match on Wednesday.
+      Time.stubs(:now).returns(Time.local(2011, "mar", 31, 1, 30, 0))
+    end
+
+    it "should match when the range matches and the day of week should match" do
+      @schedule[:range] = "22:00:00 - 02:00:00"
+      @schedule[:weekday] = "Wednesday"
+      @schedule.must be_match
+    end
+
+    it "should not match when the range does not match and the day of week should match" do
+      @schedule[:range] = "22:00:00 - 01:00:00"
+      @schedule[:weekday] = "Thursday"
+      @schedule.must_not be_match
+    end
+
+    it "should not match when the range matches but the day-of-week does not (1 day later)" do
+      @schedule[:range] = "22:00:00 - 02:00:00"
+      @schedule[:weekday] = "Thursday"
+      @schedule.must_not be_match
+    end
+
+    it "should not match when the range matches but the day-of-week does not (1 day later)" do
+      @schedule[:range] = "22:00:00 - 02:00:00"
+      @schedule[:weekday] = "Tuesday"
+      @schedule.must_not be_match
+    end
+  end
 end