diff --git a/lib/puppet/type/entropy_keywords.rb b/lib/puppet/type/entropy_keywords.rb index 87295e2..8842253 100644 --- a/lib/puppet/type/entropy_keywords.rb +++ b/lib/puppet/type/entropy_keywords.rb @@ -51,8 +51,6 @@ Puppet::Type.newtype(:entropy_keywords) do end validate do - raise(ArgumentError, "At least one of package or repo is required") if self[:package].nil? && self[:repo].nil? - raise(ArgumentError, "Package is required when a version is specified") if self[:package].nil? && !self[:version].nil? raise(ArgumentError, "Version is required when an operator is specified") if self[:version].nil? && !self[:operator].nil? diff --git a/lib/puppet/type/entropy_mask.rb b/lib/puppet/type/entropy_mask.rb index 2847a56..33f1d6a 100644 --- a/lib/puppet/type/entropy_mask.rb +++ b/lib/puppet/type/entropy_mask.rb @@ -50,8 +50,6 @@ Puppet::Type.newtype(:entropy_mask) do end validate do - raise(ArgumentError, "At least one of package, tag or repo is required") if self[:package].nil? && self[:tag].nil? && self[:repo].nil? - raise(ArgumentError, "Package is required when a version is specified") if self[:package].nil? && !self[:version].nil? raise(ArgumentError, "Version is required when an operator is specified") if self[:version].nil? && !self[:operator].nil? diff --git a/lib/puppet/type/entropy_splitdebug.rb b/lib/puppet/type/entropy_splitdebug.rb index bbfdb07..0176750 100644 --- a/lib/puppet/type/entropy_splitdebug.rb +++ b/lib/puppet/type/entropy_splitdebug.rb @@ -50,8 +50,6 @@ Puppet::Type.newtype(:entropy_splitdebug) do end validate do - raise(ArgumentError, "At least one of package, tag or repo is required") if self[:package].nil? && self[:tag].nil? && self[:repo].nil? - raise(ArgumentError, "Package is required when a version is specified") if self[:package].nil? && !self[:version].nil? raise(ArgumentError, "Version is required when an operator is specified") if self[:version].nil? && !self[:operator].nil? diff --git a/lib/puppet/type/entropy_splitdebug_mask.rb b/lib/puppet/type/entropy_splitdebug_mask.rb index c4b6992..1016b38 100644 --- a/lib/puppet/type/entropy_splitdebug_mask.rb +++ b/lib/puppet/type/entropy_splitdebug_mask.rb @@ -50,8 +50,6 @@ Puppet::Type.newtype(:entropy_splitdebug_mask) do end validate do - raise(ArgumentError, "At least one of package, tag or repo is required") if self[:package].nil? && self[:tag].nil? && self[:repo].nil? - raise(ArgumentError, "Package is required when a version is specified") if self[:package].nil? && !self[:version].nil? raise(ArgumentError, "Version is required when an operator is specified") if self[:version].nil? && !self[:operator].nil? diff --git a/lib/puppet/type/entropy_unmask.rb b/lib/puppet/type/entropy_unmask.rb index a5b740c..f81dcf7 100644 --- a/lib/puppet/type/entropy_unmask.rb +++ b/lib/puppet/type/entropy_unmask.rb @@ -50,8 +50,6 @@ Puppet::Type.newtype(:entropy_unmask) do end validate do - raise(ArgumentError, "At least one of package, tag or repo is required") if self[:package].nil? && self[:tag].nil? && self[:repo].nil? - raise(ArgumentError, "Package is required when a version is specified") if self[:package].nil? && !self[:version].nil? raise(ArgumentError, "Version is required when an operator is specified") if self[:version].nil? && !self[:operator].nil? diff --git a/spec/unit/type/entropy_keywords_spec.rb b/spec/unit/type/entropy_keywords_spec.rb index 57001e0..555c750 100644 --- a/spec/unit/type/entropy_keywords_spec.rb +++ b/spec/unit/type/entropy_keywords_spec.rb @@ -40,12 +40,6 @@ describe Puppet::Type.type(:entropy_keywords) do end describe "when validating required properties" do - it "should raise an error when no required attributes are passed" do - expect { - described_class.new(:name => "test") - }.to raise_error(Puppet::Error, /At least one of (.*) is required/) - end - it "should raise an error when a version is passed with no package" do expect { described_class.new(:name => "test", :repo => "test", :version => "1.2.3")