puppet 3.3.2 → 3.4.0.rc1

data/spec/unit/type/file_spec.rb

@@ -10,7 +10,6 @@ describe Puppet::Type.type(:file) do
   let(:catalog) { Puppet::Resource::Catalog.new }
 
   before do
-    @real_posix = Puppet.features.posix?
     Puppet.features.stubs("posix?").returns(true)
   end
 
@@ -78,33 +77,29 @@ describe Puppet::Type.type(:file) do
       end
 
       describe "when using UNC filenames", :if => Puppet.features.microsoft_windows? do
-        before :each do
-          pending("UNC file paths not yet supported")
-        end
-
         it "should remove trailing slashes" do
-          file[:path] = "//server/foo/bar/baz/"
-          file[:path].should == "//server/foo/bar/baz"
+          file[:path] = "//localhost/foo/bar/baz/"
+          file[:path].should == "//localhost/foo/bar/baz"
         end
 
         it "should remove double slashes" do
-          file[:path] = "//server/foo/bar//baz"
-          file[:path].should == "//server/foo/bar/baz"
+          file[:path] = "//localhost/foo/bar//baz"
+          file[:path].should == "//localhost/foo/bar/baz"
         end
 
         it "should remove trailing double slashes" do
-          file[:path] = "//server/foo/bar/baz//"
-          file[:path].should == "//server/foo/bar/baz"
+          file[:path] = "//localhost/foo/bar/baz//"
+          file[:path].should == "//localhost/foo/bar/baz"
         end
 
         it "should remove a trailing slash from a sharename" do
-          file[:path] = "//server/foo/"
-          file[:path].should == "//server/foo"
+          file[:path] = "//localhost/foo/"
+          file[:path].should == "//localhost/foo"
         end
 
         it "should not modify a sharename" do
-          file[:path] = "//server/foo"
-          file[:path].should == "//server/foo"
+          file[:path] = "//localhost/foo"
+          file[:path].should == "//localhost/foo"
         end
       end
     end
@@ -352,7 +347,7 @@ describe Puppet::Type.type(:file) do
       file[:ensure].should == :file
     end
 
-    it "should set a desired 'ensure' value if none is set and 'target' is set" do
+    it "should set a desired 'ensure' value if none is set and 'target' is set", :if => described_class.defaultprovider.feature?(:manages_symlinks) do
       file = described_class.new(:path => path, :target => File.expand_path(__FILE__))
       file[:ensure].should == :link
     end
@@ -397,7 +392,7 @@ describe Puppet::Type.type(:file) do
       :target => "some_target",
       :source => File.expand_path("some_source"),
     }.each do |param, value|
-      it "should omit the #{param} parameter" do
+      it "should omit the #{param} parameter", :if => described_class.defaultprovider.feature?(:manages_symlinks) do
         # Make a new file, because we have to set the param at initialization
         # or it wouldn't be copied regardless.
         file = described_class.new(:path => path, param => value)
@@ -603,7 +598,7 @@ describe Puppet::Type.type(:file) do
       file.recurse_link("first" => @resource)
     end
 
-    it "should set the target to the full path of discovered file and set :ensure to :link if the file is not a directory" do
+    it "should set the target to the full path of discovered file and set :ensure to :link if the file is not a directory", :if => described_class.defaultprovider.feature?(:manages_symlinks) do
       file.stubs(:perform_recursion).returns [@first, @second]
       file.recurse_link("first" => @resource, "second" => file)
 
@@ -925,20 +920,20 @@ describe Puppet::Type.type(:file) do
 
       file.remove_existing(:directory).should == true
 
-      File.exists?(file[:path]).should == false
+      Puppet::FileSystem::File.exist?(file[:path]).should == false
     end
 
-    it "should remove an existing link", :unless => Puppet.features.microsoft_windows? do
+    it "should remove an existing link", :if => described_class.defaultprovider.feature?(:manages_symlinks) do
       file.stubs(:perform_backup).returns true
 
       target = tmpfile('link_target')
       FileUtils.touch(target)
-      FileUtils.symlink(target, path)
+      Puppet::FileSystem::File.new(target).symlink(path)
       file[:target] = target
 
       file.remove_existing(:directory).should == true
 
-      File.exists?(file[:path]).should == false
+      Puppet::FileSystem::File.exist?(file[:path]).should == false
     end
 
     it "should fail if the file is not a file, link, or directory" do
@@ -952,7 +947,7 @@ describe Puppet::Type.type(:file) do
       file.stat
       file.stubs(:stat).returns stub('stat', :ftype => 'file')
 
-      File.stubs(:unlink)
+      Puppet::FileSystem::File.stubs(:unlink)
 
       file.remove_existing(:directory).should == true
       file.instance_variable_get(:@stat).should == :needs_stat
@@ -1010,11 +1005,11 @@ describe Puppet::Type.type(:file) do
     end
   end
 
-  describe "#stat", :unless => Puppet.features.microsoft_windows? do
+  describe "#stat", :if => described_class.defaultprovider.feature?(:manages_symlinks) do
     before do
       target = tmpfile('link_target')
       FileUtils.touch(target)
-      FileUtils.symlink(target, path)
+      Puppet::FileSystem::File.new(target).symlink(path)
 
       file[:target] = target
       file[:links] = :manage # so we always use :lstat
@@ -1033,7 +1028,7 @@ describe Puppet::Type.type(:file) do
     end
 
     it "should return nil if the file does not exist" do
-      file[:path] = '/foo/bar/baz/non-existent'
+      file[:path] = make_absolute('/foo/bar/baz/non-existent')
 
       file.stat.should be_nil
     end
@@ -1207,7 +1202,7 @@ describe Puppet::Type.type(:file) do
 
   describe "when autorequiring" do
     describe "target" do
-      it "should require file resource when specified with the target property" do
+      it "should require file resource when specified with the target property", :if => described_class.defaultprovider.feature?(:manages_symlinks) do
         file = described_class.new(:path => File.expand_path("/foo"), :ensure => :directory)
         link = described_class.new(:path => File.expand_path("/bar"), :ensure => :link, :target => File.expand_path("/foo"))
         catalog.add_resource file
@@ -1229,7 +1224,7 @@ describe Puppet::Type.type(:file) do
         reqs[0].target.must == link
       end
 
-      it "should not require target if target is not managed" do
+      it "should not require target if target is not managed", :if => described_class.defaultprovider.feature?(:manages_symlinks) do
         link = described_class.new(:path => File.expand_path('/foo'), :ensure => :link, :target => '/bar')
         catalog.add_resource link
         link.autorequire.size.should == 0
@@ -1272,8 +1267,8 @@ describe Puppet::Type.type(:file) do
       describe "on Windows systems", :if => Puppet.features.microsoft_windows? do
         describe "when using UNC filenames" do
           it "should autorequire its parent directory" do
-            file[:path] = '//server/foo/bar/baz'
-            dir = described_class.new(:path => "//server/foo/bar")
+            file[:path] = '//localhost/foo/bar/baz'
+            dir = described_class.new(:path => "//localhost/foo/bar")
             catalog.add_resource file
             catalog.add_resource dir
             reqs = file.autorequire
@@ -1282,9 +1277,9 @@ describe Puppet::Type.type(:file) do
           end
 
           it "should autorequire its nearest ancestor directory" do
-            file = described_class.new(:path => "//server/foo/bar/baz/qux")
-            dir = described_class.new(:path => "//server/foo/bar/baz")
-            grandparent = described_class.new(:path => "//server/foo/bar")
+            file = described_class.new(:path => "//localhost/foo/bar/baz/qux")
+            dir = described_class.new(:path => "//localhost/foo/bar/baz")
+            grandparent = described_class.new(:path => "//localhost/foo/bar")
             catalog.add_resource file
             catalog.add_resource dir
             catalog.add_resource grandparent
@@ -1295,13 +1290,13 @@ describe Puppet::Type.type(:file) do
           end
 
           it "should not autorequire anything when there is no nearest ancestor directory" do
-            file = described_class.new(:path => "//server/foo/bar/baz/qux")
+            file = described_class.new(:path => "//localhost/foo/bar/baz/qux")
             catalog.add_resource file
             file.autorequire.should be_empty
           end
 
           it "should not autorequire its parent dir if its parent dir is itself" do
-            file = described_class.new(:path => "//server/foo")
+            file = described_class.new(:path => "//localhost/foo")
             catalog.add_resource file
             puts file.autorequire
             file.autorequire.should be_empty
@@ -1311,49 +1306,46 @@ describe Puppet::Type.type(:file) do
     end
   end
 
-  describe "when managing links" do
+  describe "when managing links", :if => Puppet.features.manages_symlinks? do
     require 'tempfile'
 
-    if @real_posix
-      describe "on POSIX systems" do
-        before do
-          Dir.mkdir(path)
-          @target = File.join(path, "target")
-          @link   = File.join(path, "link")
-
-          File.open(@target, "w", 0644) { |f| f.puts "yayness" }
-          File.symlink(@target, @link)
-
-          file[:path] = @link
-          file[:mode] = 0755
-
-          catalog.add_resource file
-        end
+    before :each do
+      Dir.mkdir(path)
+      @target = File.join(path, "target")
+      @link   = File.join(path, "link")
+
+      target = described_class.new(
+        :ensure => :file, :path => @target,
+        :catalog => catalog, :content => 'yayness',
+        :mode => 0644)
+      catalog.add_resource target
+
+      @link_resource = described_class.new(
+        :ensure => :link, :path => @link,
+        :target => @target, :catalog => catalog,
+        :mode => 0755)
+      catalog.add_resource @link_resource
 
-        it "should default to managing the link" do
-          catalog.apply
-          # I convert them to strings so they display correctly if there's an error.
-          (File.stat(@target).mode & 007777).to_s(8).should == '644'
-        end
+      # to prevent the catalog from trying to write state.yaml
+      Puppet::Util::Storage.stubs(:store)
+    end
 
-        it "should be able to follow links" do
-          file[:links] = :follow
-          catalog.apply
+    it "should preserve the original file mode and ignore the one set by the link" do
+      @link_resource[:links] = :manage # default
+      catalog.apply
 
-          (File.stat(@target).mode & 007777).to_s(8).should == '755'
-        end
-      end
-    else # @real_posix
-      # should recode tests using expectations instead of using the filesystem
+      # I convert them to strings so they display correctly if there's an error.
+      (Puppet::FileSystem::File.new(@target).stat.mode & 007777).to_s(8).should == '644'
     end
 
-    describe "on Microsoft Windows systems" do
-      before do
-        Puppet.features.stubs(:posix?).returns(false)
-        Puppet.features.stubs(:microsoft_windows?).returns(true)
-      end
+    it "should manage the mode of the followed link" do
+      pending("Windows cannot presently manage the mode when following symlinks",
+        :if => Puppet.features.microsoft_windows?) do
+        @link_resource[:links] = :follow
+        catalog.apply
 
-      it "should refuse to work with links"
+        (Puppet::FileSystem::File.new(@target).stat.mode & 007777).to_s(8).should == '755'
+      end
     end
   end
 
@@ -1436,7 +1428,7 @@ describe Puppet::Type.type(:file) do
 
       catalog.apply
 
-      File.should be_exist(path)
+      Puppet::FileSystem::File.exist?(path).should be_true
       @logs.should_not be_any {|l| l.level != :notice }
     end
   end

data/spec/unit/type/group_spec.rb

@@ -61,4 +61,24 @@ describe Puppet::Type.type(:group) do
 
     type.exists?.should == true
   end
+
+  describe "should delegate :members implementation to the provider:"  do
+
+    let (:provider) { @class.provide(:testing) { has_features :manages_members } }
+    let (:provider_instance) { provider.new }
+    let (:type) { @class.new(:name => "group", :provider => provider_instance, :members => ['user1']) }
+
+    it "insync? calls members_insync?" do
+      provider_instance.expects(:members_insync?).with(['user1'], ['user1']).returns true
+      type.property(:members).insync?(['user1']).should be_true
+    end
+
+    it "is_to_s and should_to_s call members_to_s" do
+      provider_instance.expects(:members_to_s).with(['user2', 'user1']).returns "user2 (), user1 ()"
+      provider_instance.expects(:members_to_s).with(['user1']).returns "user1 ()"
+
+      type.property(:members).is_to_s('user1').should == 'user1 ()'
+      type.property(:members).should_to_s('user2,user1').should == 'user2 (), user1 ()'
+    end
+  end
 end

data/spec/unit/type/k5login_spec.rb

@@ -46,7 +46,7 @@ describe Puppet::Type.type(:k5login), :unless => Puppet.features.microsoft_windo
 
       it "should create the file when synced" do
         resource(:ensure => 'present').parameter(:ensure).sync
-        File.should be_exist path
+        Puppet::FileSystem::File.exist?(path).should be_true
       end
     end
 
@@ -83,7 +83,7 @@ describe Puppet::Type.type(:k5login), :unless => Puppet.features.microsoft_windo
 
       it "should remove the file ensure is absent" do
         resource(:ensure => 'absent').property(:ensure).sync
-        File.should_not be_exist path
+        Puppet::FileSystem::File.exist?(path).should be_false
       end
 
       it "should write one principal to the file" do
@@ -106,7 +106,7 @@ describe Puppet::Type.type(:k5login), :unless => Puppet.features.microsoft_windo
           it "should update the mode to #{mode}" do
             resource(:mode => mode).property(:mode).sync
 
-            (File.stat(path).mode & 07777).to_s(8).should == mode
+            (Puppet::FileSystem::File.new(path).stat.mode & 07777).to_s(8).should == mode
           end
         end
       end

data/spec/unit/type/mount_spec.rb

@@ -536,4 +536,57 @@ describe Puppet::Type.type(:mount), :unless => Puppet.features.microsoft_windows
       run_in_catalog(resource)
     end
   end
+
+  describe "establishing autorequires" do
+
+    def create_resource(path)
+      described_class.new(
+        :name => path,
+        :provider => providerclass.new(path)
+      )
+    end
+
+    def create_catalog(*resources)
+      catalog = Puppet::Resource::Catalog.new
+      resources.each do |resource|
+        catalog.add_resource resource
+      end
+
+      catalog
+    end
+
+    let(:root_mount) { create_resource("/") }
+    let(:var_mount)  { create_resource("/var") }
+    let(:log_mount)  { create_resource("/var/log") }
+
+    before do
+      create_catalog(root_mount, var_mount, log_mount)
+    end
+
+    it "adds no autorequires for the root mount" do
+      expect(root_mount.autorequire).to be_empty
+    end
+
+    it "adds the parent autorequire for a mount with one parent" do
+      parent_relationship = var_mount.autorequire[0]
+
+      expect(var_mount.autorequire).to have_exactly(1).item
+
+      expect(parent_relationship.source).to eq root_mount
+      expect(parent_relationship.target).to eq var_mount
+    end
+
+    it "adds both parent autorequires for a mount with two parents" do
+      grandparent_relationship = log_mount.autorequire[0]
+      parent_relationship = log_mount.autorequire[1]
+
+      expect(log_mount.autorequire).to have_exactly(2).items
+
+      expect(grandparent_relationship.source).to eq root_mount
+      expect(grandparent_relationship.target).to eq log_mount
+
+      expect(parent_relationship.source).to eq var_mount
+      expect(parent_relationship.target).to eq log_mount
+    end
+  end
 end

data/spec/unit/type/nagios_spec.rb

@@ -3,6 +3,222 @@ require 'spec_helper'
 
 require 'puppet/external/nagios'
 
+describe "Nagios parser" do
+
+    NONESCAPED_SEMICOLON_COMMENT = <<-'EOL'
+define host{
+    use                     linux-server            ; Name of host template to use
+    host_name               localhost
+    alias                   localhost
+    address                 127.0.0.1
+    }
+
+define command{
+  command_name  notify-host-by-email
+  command_line  /usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | /usr/bin/mail -s "** $NOTIFICATIONTYPE$ Host Alert: $HOSTNAME$ is $HOSTSTATE$ **" $CONTACTEMAIL$
+  }
+EOL
+
+    LINE_COMMENT_SNIPPET = <<-'EOL'
+
+# This is a comment starting at the beginning of a line
+
+define command{
+
+# This is a comment starting at the beginning of a line
+
+  command_name  command_name
+
+# This is a comment starting at the beginning of a line
+  ## --PUPPET_NAME-- (called '_naginator_name' in the manifest)                command_name
+
+  command_line  command_line
+
+# This is a comment starting at the beginning of a line
+
+  }
+
+# This is a comment starting at the beginning of a line
+
+EOL
+
+    LINE_COMMENT_SNIPPET2 = <<-'EOL'
+      define host{
+          use                     linux-server            ; Name of host template to use
+          host_name               localhost
+          alias                   localhost
+          address                 127.0.0.1
+          }
+define command{
+  command_name  command_name2
+  command_line  command_line2
+  }
+EOL
+
+    UNKNOWN_NAGIOS_OBJECT_DEFINITION = <<-'EOL'
+      define command2{
+        command_name  notify-host-by-email
+        command_line  /usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | /usr/bin/mail -s "** $NOTIFICATIONTYPE$ Host Alert: $HOSTNAME$ is $HOSTSTATE$ **" $CONTACTEMAIL$
+        }
+      EOL
+
+    MISSING_CLOSING_CURLY_BRACKET = <<-'EOL'
+      define command{
+        command_name  notify-host-by-email
+        command_line  /usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | /usr/bin/mail -s "** $NOTIFICATIONTYPE$ Host Alert: $HOSTNAME$ is $HOSTSTATE$ **" $CONTACTEMAIL$
+      EOL
+
+    ESCAPED_SEMICOLON = <<-'EOL'
+        define command {
+            command_name  nagios_table_size
+            command_line $USER3$/check_mysql_health --hostname localhost --username nagioschecks --password nagiosCheckPWD --mode sql --name "SELECT ROUND(Data_length/1024) as Data_kBytes from INFORMATION_SCHEMA.TABLES where TABLE_NAME=\"$ARG1$\"\;" --name2 "table size" --units kBytes -w $ARG2$ -c $ARG3$
+        }
+      EOL
+
+    POUND_SIGN_HASH_SYMBOL_NOT_IN_FIRST_COLUMN = <<-'EOL'
+        define command {
+            command_name  notify-by-irc
+            command_line /usr/local/bin/riseup-nagios-client.pl "$HOSTNAME$ ($SERVICEDESC$) $NOTIFICATIONTYPE$ #$SERVICEATTEMPT$ $SERVICESTATETYPE$ $SERVICEEXECUTIONTIME$s $SERVICELATENCY$s $SERVICEOUTPUT$ $SERVICEPERFDATA$"
+        }
+      EOL
+
+    ANOTHER_ESCAPED_SEMICOLON = <<-EOL
+define command {
+\tcommand_line                   LC_ALL=en_US.UTF-8 /usr/lib/nagios/plugins/check_haproxy -u 'http://blah:blah@$HOSTADDRESS$:8080/haproxy?stats\\;csv'
+\tcommand_name                   check_haproxy
+}
+EOL
+
+  it "should parse without error" do
+    parser =  Nagios::Parser.new
+    expect {
+      results = parser.parse(NONESCAPED_SEMICOLON_COMMENT)
+    }.to_not raise_error
+  end
+
+  describe "when parsing a statement" do
+    parser =  Nagios::Parser.new
+    results = parser.parse(NONESCAPED_SEMICOLON_COMMENT)
+    results.each do |obj|
+      it "should have the proper base type" do
+        obj.should be_a_kind_of(Nagios::Base)
+      end
+    end
+  end
+
+  it "should raise an error when an incorrect object definition is present" do
+    parser =  Nagios::Parser.new
+    expect {
+      results = parser.parse(UNKNOWN_NAGIOS_OBJECT_DEFINITION)
+    }.to raise_error Nagios::Base::UnknownNagiosType
+  end
+
+  it "should raise an error when syntax is not correct" do
+    parser =  Nagios::Parser.new
+    expect {
+      results = parser.parse(MISSING_CLOSING_CURLY_BRACKET)
+    }.to raise_error Nagios::Parser::SyntaxError
+  end
+
+  describe "when encoutering ';'" do
+    it "should not throw an exception" do
+      parser =  Nagios::Parser.new
+      expect {
+        results = parser.parse(ESCAPED_SEMICOLON)
+      }.to_not raise_error Nagios::Parser::SyntaxError
+    end
+
+    it "should ignore it if it is a comment" do
+      parser =  Nagios::Parser.new
+      results = parser.parse(NONESCAPED_SEMICOLON_COMMENT)
+      results[0].use.should eql("linux-server")
+    end
+
+    it "should parse correctly if it is escaped" do
+      parser =  Nagios::Parser.new
+      results = parser.parse(ESCAPED_SEMICOLON)
+      results[0].command_line.should eql("$USER3$/check_mysql_health --hostname localhost --username nagioschecks --password nagiosCheckPWD --mode sql --name \"SELECT ROUND(Data_length/1024) as Data_kBytes from INFORMATION_SCHEMA.TABLES where TABLE_NAME=\\\"$ARG1$\\\";\" --name2 \"table size\" --units kBytes -w $ARG2$ -c $ARG3$")
+    end
+  end
+
+  describe "when encountering '#'" do
+
+    it "should not throw an exception" do
+      parser =  Nagios::Parser.new
+      expect {
+        results = parser.parse(POUND_SIGN_HASH_SYMBOL_NOT_IN_FIRST_COLUMN)
+      }.to_not raise_error Nagios::Parser::SyntaxError
+    end
+
+
+    it "should ignore it at the beginning of a line" do
+      parser =  Nagios::Parser.new
+      results = parser.parse(LINE_COMMENT_SNIPPET)
+      results[0].command_line.should eql("command_line")
+    end
+
+    it "should let it go anywhere else" do
+      parser =  Nagios::Parser.new
+      results = parser.parse(POUND_SIGN_HASH_SYMBOL_NOT_IN_FIRST_COLUMN)
+      results[0].command_line.should eql("/usr/local/bin/riseup-nagios-client.pl \"$HOSTNAME$ ($SERVICEDESC$) $NOTIFICATIONTYPE$ \#$SERVICEATTEMPT$ $SERVICESTATETYPE$ $SERVICEEXECUTIONTIME$s $SERVICELATENCY$s $SERVICEOUTPUT$ $SERVICEPERFDATA$\"")
+    end
+
+  end
+
+  describe "when encountering ';' again" do
+    it "should not throw an exception" do
+      parser =  Nagios::Parser.new
+      expect {
+        results = parser.parse(ANOTHER_ESCAPED_SEMICOLON)
+      }.to_not raise_error Nagios::Parser::SyntaxError
+    end
+
+    it "should parse correctly" do
+      parser =  Nagios::Parser.new
+      results = parser.parse(ANOTHER_ESCAPED_SEMICOLON)
+      results[0].command_line.should eql("LC_ALL=en_US.UTF-8 /usr/lib/nagios/plugins/check_haproxy -u 'http://blah:blah@$HOSTADDRESS$:8080/haproxy?stats;csv'")
+    end
+  end
+
+
+  it "should be idempotent" do
+    parser =  Nagios::Parser.new
+    src = ANOTHER_ESCAPED_SEMICOLON.dup
+    results = parser.parse(src)
+    nagios_type = Nagios::Base.create(:command)
+    nagios_type.command_name = results[0].command_name
+    nagios_type.command_line = results[0].command_line
+    nagios_type.to_s.should eql(ANOTHER_ESCAPED_SEMICOLON)
+  end
+
+end
+
+describe "Nagios generator" do
+
+  it "should escape ';'" do
+    param = '$USER3$/check_mysql_health --hostname localhost --username nagioschecks --password nagiosCheckPWD --mode sql --name "SELECT ROUND(Data_length/1024) as Data_kBytes from INFORMATION_SCHEMA.TABLES where TABLE_NAME=\"$ARG1$\";" --name2 "table size" --units kBytes -w $ARG2$ -c $ARG3$'
+    nagios_type = Nagios::Base.create(:command)
+    nagios_type.command_line = param
+    nagios_type.to_s.should eql("define command {\n\tcommand_line                   $USER3$/check_mysql_health --hostname localhost --username nagioschecks --password nagiosCheckPWD --mode sql --name \"SELECT ROUND(Data_length/1024) as Data_kBytes from INFORMATION_SCHEMA.TABLES where TABLE_NAME=\\\"$ARG1$\\\"\\;\" --name2 \"table size\" --units kBytes -w $ARG2$ -c $ARG3$\n}\n")
+  end
+
+  it "should escape ';' if it is not already the case" do
+    param = "LC_ALL=en_US.UTF-8 /usr/lib/nagios/plugins/check_haproxy -u 'http://blah:blah@$HOSTADDRESS$:8080/haproxy?stats;csv'"
+    nagios_type = Nagios::Base.create(:command)
+    nagios_type.command_line = param
+    nagios_type.to_s.should eql("define command {\n\tcommand_line                   LC_ALL=en_US.UTF-8 /usr/lib/nagios/plugins/check_haproxy -u 'http://blah:blah@$HOSTADDRESS$:8080/haproxy?stats\\;csv'\n}\n")
+  end
+
+  it "should be idempotent" do
+    param = '$USER3$/check_mysql_health --hostname localhost --username nagioschecks --password nagiosCheckPWD --mode sql --name "SELECT ROUND(Data_length/1024) as Data_kBytes from INFORMATION_SCHEMA.TABLES where TABLE_NAME=\"$ARG1$\";" --name2 "table size" --units kBytes -w $ARG2$ -c $ARG3$'
+    nagios_type = Nagios::Base.create(:command)
+    nagios_type.command_line = param
+    parser =  Nagios::Parser.new
+    results = parser.parse(nagios_type.to_s)
+    results[0].command_line.should eql(param)
+  end
+end
+
 describe "Nagios resource types" do
   Nagios::Base.eachtype do |name, nagios_type|
     puppet_type = Puppet::Type.type("nagios_#{name}")