Merge branch '0.24.x'

Conflicts:

	CHANGELOG
	spec/unit/node/catalog.rb
	spec/unit/type/package.rb
	spec/unit/type/schedule.rb
	spec/unit/type/service.rb
	spec/unit/util/settings.rb

1 files changed, 5 insertions, 4 deletions

diff --git a/test/ral/providers/cron/crontab.rb b/test/ral/providers/cron/crontab.rb
index 900a0478e..d9f460258 100755
--- a/test/ral/providers/cron/crontab.rb
+++ b/test/ral/providers/cron/crontab.rb
@@ -530,8 +530,6 @@ class TestCronParsedProvider < Test::Unit::TestCase
             @provider.initvars
             str += "\n"
             target.write(str)
-            assert_equal(str, target.read,
-                "Did not write correctly")
             assert_nothing_raised("Could not prefetch with %s" % str.inspect) do
                 @provider.prefetch
             end
@@ -551,6 +549,11 @@ class TestCronParsedProvider < Test::Unit::TestCase
         end
     end
 
+    # #707
+    def test_write_freebsd_special
+        assert_equal(@provider.to_line(:record_type => :crontab, :ensure => :present, :special => "reboot", :command => "/bin/echo something"), "@reboot /bin/echo something")
+    end
+
     def test_prefetch
         cron = @type.create :command => "/bin/echo yay", :name => "test", :hour => 4
 
@@ -626,6 +629,4 @@ class TestCronParsedProvider < Test::Unit::TestCase
             assert_equal(v, is[p], "did not parse %s correctly" % p)
         end
     end
-
 end
-