puppet 2.7.9 → 2.7.11

data/spec/unit/ssl/certificate_factory_spec.rb

@@ -52,19 +52,19 @@ describe Puppet::SSL::CertificateFactory do
 
     it "should have 24 hours grace on the start of the cert" do
       cert = subject.build(:server, csr, issuer, serial)
-      cert.not_before.should be_within(1).of(Time.now - 24*60*60)
+      cert.not_before.should be_within(30).of(Time.now - 24*60*60)
     end
 
     it "should set the default TTL of the certificate" do
       ttl  = Puppet::SSL::CertificateFactory.ttl
       cert = subject.build(:server, csr, issuer, serial)
-      cert.not_after.should be_within(1).of(Time.now + ttl)
+      cert.not_after.should be_within(30).of(Time.now + ttl)
     end
 
     it "should respect a custom TTL for the CA" do
       Puppet[:ca_ttl] = 12
       cert = subject.build(:server, csr, issuer, serial)
-      cert.not_after.should be_within(1).of(Time.now + 12)
+      cert.not_after.should be_within(30).of(Time.now + 12)
     end
 
     it "should build extensions for the certificate" do

data/spec/unit/transaction/report_spec.rb

@@ -179,6 +179,11 @@ describe Puppet::Transaction::Report do
           @report.finalize_report
           metric(:resources, state.to_s).should == 3
         end
+
+        it "should provide 0 for states not in status" do
+          @report.finalize_report
+          metric(:resources, state.to_s).should == 0
+        end
       end
 
       it "should mark the report as 'failed' if there are failing resources" do
@@ -274,13 +279,14 @@ describe Puppet::Transaction::Report do
       resource = Puppet::Type.type(:notify).new(:name => "testing")
       catalog = Puppet::Resource::Catalog.new
       catalog.add_resource resource
+      catalog.version = 1234567
       trans = catalog.apply
 
       @report = trans.report
       @report.finalize_report
     end
 
-    %w{changes time resources events}.each do |main|
+    %w{changes time resources events version}.each do |main|
       it "should include the key #{main} in the raw summary hash" do
         @report.raw_summary.should be_key main
       end
@@ -291,6 +297,28 @@ describe Puppet::Transaction::Report do
       @report.raw_summary["time"]["last_run"].should == 1289390424
     end
 
+    it "should include all resource statuses" do
+      resources_report = @report.raw_summary["resources"]
+      Puppet::Resource::Status::STATES.each do |state|
+        resources_report.should be_include(state.to_s)
+      end
+    end
+
+    %w{total failure success}.each do |r|
+      it "should include event #{r}" do
+        events_report = @report.raw_summary["events"]
+        events_report.should be_include(r)
+      end
+    end
+
+    it "should include config version" do
+      @report.raw_summary["version"]["config"].should == 1234567
+    end
+
+    it "should include puppet version" do
+      @report.raw_summary["version"]["puppet"].should == Puppet.version
+    end
+
     %w{Changes Total Resources Time Events}.each do |main|
       it "should include information on #{main} in the textual summary" do
         @report.summary.should be_include(main)

data/spec/unit/transaction_spec.rb

@@ -436,6 +436,10 @@ describe Puppet::Transaction do
 
       @transaction.catalog.add_resource(dependent, dependent2)
 
+      # We enqueue them here just so we can check their blockers. This is done
+      # again in traverse.
+      graph.enqueue_roots
+
       graph.blockers[dependent].should == 1
       graph.blockers[dependent2].should == 1
 
@@ -453,6 +457,8 @@ describe Puppet::Transaction do
 
       @transaction.catalog.add_resource(dependent, dependent2)
 
+      graph.enqueue_roots
+
       graph.blockers[dependent].should == 1
       graph.blockers[dependent2].should == 1
 
@@ -510,70 +516,50 @@ describe Puppet::Transaction do
     end
   end
 
-  describe "when generating resources" do
-    it "should call 'generate' on all created resources" do
-      first = Puppet::Type.type(:notify).new(:name => "first")
-      second = Puppet::Type.type(:notify).new(:name => "second")
-      third = Puppet::Type.type(:notify).new(:name => "third")
+  describe "when generating resources before traversal" do
+    let(:catalog) { Puppet::Resource::Catalog.new }
+    let(:transaction) { Puppet::Transaction.new(catalog) }
+    let(:generator) { Puppet::Type.type(:notify).create :title => "generator" }
+    let(:generated) do
+      %w[a b c].map { |name| Puppet::Type.type(:notify).new(:name => name) }
+    end
 
-      @catalog = Puppet::Resource::Catalog.new
-      @transaction = Puppet::Transaction.new(@catalog)
+    before :each do
+      catalog.add_resource generator
+      generator.stubs(:generate).returns generated
+    end
 
-      first.expects(:generate).returns [second]
-      second.expects(:generate).returns [third]
-      third.expects(:generate)
+    it "should call 'generate' on all created resources" do
+      generated.each { |res| res.expects(:generate) }
 
-      @transaction.generate_additional_resources(first)
+      transaction.add_dynamically_generated_resources
     end
 
     it "should finish all resources" do
-      generator = stub 'generator', :depthfirst? => true, :tags => [], :ref => "Some[resource]"
-      resource = stub 'resource', :tag => nil
-
-      @catalog = Puppet::Resource::Catalog.new
-      @transaction = Puppet::Transaction.new(@catalog)
-
-      generator.expects(:generate).returns [resource]
-
-      @catalog.expects(:add_resource).yields(resource)
-
-      resource.expects(:finish)
+      generated.each { |res| res.expects(:finish) }
 
-      @transaction.generate_additional_resources(generator)
+      transaction.add_dynamically_generated_resources
     end
 
     it "should skip generated resources that conflict with existing resources" do
-      generator = mock 'generator', :tags => []
-      resource = stub 'resource', :tag => nil
-
-      @catalog = Puppet::Resource::Catalog.new
-      @transaction = Puppet::Transaction.new(@catalog)
+      duplicate = generated.first
+      catalog.add_resource(duplicate)
 
-      generator.expects(:generate).returns [resource]
+      duplicate.expects(:finish).never
 
-      @catalog.expects(:add_resource).raises(Puppet::Resource::Catalog::DuplicateResourceError.new("foo"))
+      duplicate.expects(:info).with { |msg| msg =~ /Duplicate generated resource/ }
 
-      resource.expects(:finish).never
-      resource.expects(:info) # log that it's skipped
-
-      @transaction.generate_additional_resources(generator)
+      transaction.add_dynamically_generated_resources
     end
 
     it "should copy all tags to the newly generated resources" do
-      child = stub 'child', :ref => "Some[child_resource]"
-      generator = stub 'resource', :tags => ["one", "two"], :ref => "Some[resource]"
-
-      @catalog = Puppet::Resource::Catalog.new
-      @transaction = Puppet::Transaction.new(@catalog)
-
-      generator.stubs(:generate).returns [child]
-      @catalog.stubs(:add_resource)
+      generator.tag('one', 'two')
 
-      child.expects(:tag).with("one", "two")
-      child.expects(:finish)
-      generator.expects(:depthfirst?)
+      transaction.add_dynamically_generated_resources
 
-      @transaction.generate_additional_resources(generator)
+      generated.each do |res|
+        res.should be_tagged(generator.tags)
+      end
     end
   end
 

data/spec/unit/type/file/mode_spec.rb

@@ -21,7 +21,7 @@ describe Puppet::Type.type(:file).attrclass(:mode) do
     it "should not accept strings other than octal numbers" do
       expect do
         mode.value = 'readable please!'
-      end.to raise_error(Puppet::Error, /File modes can only be octal numbers/)
+      end.to raise_error(Puppet::Error, /The file mode specification is invalid/)
     end
   end
 

data/spec/unit/type/file/source_spec.rb

@@ -156,8 +156,10 @@ describe Puppet::Type.type(:file).attrclass(:source) do
       @resource = Puppet::Type.type(:file).new :path => @foobar
 
       @source = source.new(:resource => @resource)
-      @metadata = stub 'metadata', :owner => 100, :group => 200, :mode => 123, :checksum => "{md5}asdfasdf", :ftype => "file"
+      @metadata = stub 'metadata', :owner => 100, :group => 200, :mode => 123, :checksum => "{md5}asdfasdf", :ftype => "file", :source => @foobar
       @source.stubs(:metadata).returns @metadata
+
+      Puppet.features.stubs(:root?).returns true
     end
 
     it "should fail if there is no metadata" do
@@ -184,11 +186,10 @@ describe Puppet::Type.type(:file).attrclass(:source) do
     describe "and the source is a file" do
       before do
         @metadata.stubs(:ftype).returns "file"
+        Puppet.features.stubs(:microsoft_windows?).returns false
       end
 
       it "should copy the metadata's owner, group, checksum, and mode to the resource if they are not set on the resource" do
-        Puppet.features.expects(:root?).returns true
-
         @source.copy_source_values
 
         @resource[:owner].must == 100
@@ -221,6 +222,30 @@ describe Puppet::Type.type(:file).attrclass(:source) do
           @resource[:owner].should be_nil
         end
       end
+
+      describe "on Windows" do
+        before :each do
+          Puppet.features.stubs(:microsoft_windows?).returns true
+        end
+
+        it "should not copy owner and group from remote sources" do
+          @source.stubs(:local?).returns false
+
+          @source.copy_source_values
+
+          @resource[:owner].must be_nil
+          @resource[:group].must be_nil
+        end
+
+        it "should copy owner and group from local sources" do
+          @source.stubs(:local?).returns true
+
+          @source.copy_source_values
+
+          @resource[:owner].must == 100
+          @resource[:group].must == 200
+        end
+      end
     end
 
     describe "and the source is a link" do

data/spec/unit/type/file_spec.rb

@@ -500,8 +500,9 @@ describe Puppet::Type.type(:file) do
     end
 
     it "should not copy values to the child which were set by the source" do
-      file[:source] = File.expand_path(__FILE__)
-      metadata = stub 'metadata', :owner => "root", :group => "root", :mode => 0755, :ftype => "file", :checksum => "{md5}whatever"
+      source = File.expand_path(__FILE__)
+      file[:source] = source
+      metadata = stub 'metadata', :owner => "root", :group => "root", :mode => 0755, :ftype => "file", :checksum => "{md5}whatever", :source => source
       file.parameter(:source).stubs(:metadata).returns metadata
 
       file.parameter(:source).copy_source_values
@@ -841,7 +842,7 @@ describe Puppet::Type.type(:file) do
     describe "and multiple sources are provided" do
       let(:sources) do
         h = {}
-        %w{/one /two /three /four}.each do |key|
+        %w{/a /b /c /d}.each do |key|
           h[key] = URI.unescape(Puppet::Util.path_to_uri(File.expand_path(key)).to_s)
         end
         h
@@ -850,11 +851,11 @@ describe Puppet::Type.type(:file) do
       describe "and :sourceselect is set to :first" do
         it "should create file instances for the results for the first source to return any values" do
           data = Puppet::FileServing::Metadata.new("/whatever", :relative_path => "foobar")
-          file[:source] = sources.keys.map { |key| File.expand_path(key) }
-          file.expects(:perform_recursion).with(sources['/one']).returns nil
-          file.expects(:perform_recursion).with(sources['/two']).returns []
-          file.expects(:perform_recursion).with(sources['/three']).returns [data]
-          file.expects(:perform_recursion).with(sources['/four']).never
+          file[:source] = sources.keys.sort.map { |key| File.expand_path(key) }
+          file.expects(:perform_recursion).with(sources['/a']).returns nil
+          file.expects(:perform_recursion).with(sources['/b']).returns []
+          file.expects(:perform_recursion).with(sources['/c']).returns [data]
+          file.expects(:perform_recursion).with(sources['/d']).never
           file.expects(:newchild).with("foobar").returns @resource
           file.recurse_remote({})
         end
@@ -867,22 +868,22 @@ describe Puppet::Type.type(:file) do
 
         it "should return every found file that is not in a previous source" do
           klass = Puppet::FileServing::Metadata
-          file[:source] = %w{/one /two /three /four}.map {|f| File.expand_path(f) }
+          file[:source] = %w{/a /b /c /d}.map {|f| File.expand_path(f) }
           file.stubs(:newchild).returns @resource
 
-          one = [klass.new("/one", :relative_path => "a")]
-          file.expects(:perform_recursion).with(sources['/one']).returns one
+          one = [klass.new("/a", :relative_path => "a")]
+          file.expects(:perform_recursion).with(sources['/a']).returns one
           file.expects(:newchild).with("a").returns @resource
 
-          two = [klass.new("/two", :relative_path => "a"), klass.new("/two", :relative_path => "b")]
-          file.expects(:perform_recursion).with(sources['/two']).returns two
+          two = [klass.new("/b", :relative_path => "a"), klass.new("/b", :relative_path => "b")]
+          file.expects(:perform_recursion).with(sources['/b']).returns two
           file.expects(:newchild).with("b").returns @resource
 
-          three = [klass.new("/three", :relative_path => "a"), klass.new("/three", :relative_path => "c")]
-          file.expects(:perform_recursion).with(sources['/three']).returns three
+          three = [klass.new("/c", :relative_path => "a"), klass.new("/c", :relative_path => "c")]
+          file.expects(:perform_recursion).with(sources['/c']).returns three
           file.expects(:newchild).with("c").returns @resource
 
-          file.expects(:perform_recursion).with(sources['/four']).returns []
+          file.expects(:perform_recursion).with(sources['/d']).returns []
 
           file.recurse_remote({})
         end

data/spec/unit/type/host_spec.rb

@@ -70,10 +70,537 @@ describe host do
       proc { @class.new(:name => "foo", :ip => '192.168.0.300') }.should raise_error
     end
 
+    it "should reject over-long IPv4 addresses" do
+      expect { @class.new(:name => "foo", :ip => '10.10.10.10.10') }.to raise_error
+    end
+
     it "should not accept malformed IP addresses like 2001:0dg8:85a3:08d3:1319:8a2e:0370:7344" do
       proc { @class.new(:name => "foo", :ip => '2001:0dg8:85a3:08d3:1319:8a2e:0370:7344') }.should raise_error
     end
 
+    # Assorted, annotated IPv6 passes.
+    ["::1",                          # loopback, compressed, non-routable
+     "::",                           # unspecified, compressed, non-routable
+     "0:0:0:0:0:0:0:1",              # loopback, full
+     "0:0:0:0:0:0:0:0",              # unspecified, full
+     "2001:DB8:0:0:8:800:200C:417A", # unicast, full
+     "FF01:0:0:0:0:0:0:101",         # multicast, full
+     "2001:DB8::8:800:200C:417A",    # unicast, compressed
+     "FF01::101",                    # multicast, compressed
+     # Some more test cases that should pass.
+     "2001:0000:1234:0000:0000:C1C0:ABCD:0876",
+     "3ffe:0b00:0000:0000:0001:0000:0000:000a",
+     "FF02:0000:0000:0000:0000:0000:0000:0001",
+     "0000:0000:0000:0000:0000:0000:0000:0001",
+     "0000:0000:0000:0000:0000:0000:0000:0000",
+     # Assorted valid, compressed IPv6 addresses.
+     "2::10",
+     "ff02::1",
+     "fe80::",
+     "2002::",
+     "2001:db8::",
+     "2001:0db8:1234::",
+     "::ffff:0:0",
+     "::1",
+     "1:2:3:4:5:6:7:8",
+     "1:2:3:4:5:6::8",
+     "1:2:3:4:5::8",
+     "1:2:3:4::8",
+     "1:2:3::8",
+     "1:2::8",
+     "1::8",
+     "1::2:3:4:5:6:7",
+     "1::2:3:4:5:6",
+     "1::2:3:4:5",
+     "1::2:3:4",
+     "1::2:3",
+     "1::8",
+     "::2:3:4:5:6:7:8",
+     "::2:3:4:5:6:7",
+     "::2:3:4:5:6",
+     "::2:3:4:5",
+     "::2:3:4",
+     "::2:3",
+     "::8",
+     "1:2:3:4:5:6::",
+     "1:2:3:4:5::",
+     "1:2:3:4::",
+     "1:2:3::",
+     "1:2::",
+     "1::",
+     "1:2:3:4:5::7:8",
+     "1:2:3:4::7:8",
+     "1:2:3::7:8",
+     "1:2::7:8",
+     "1::7:8",
+     # IPv4 addresses as dotted-quads
+     "1:2:3:4:5:6:1.2.3.4",
+     "1:2:3:4:5::1.2.3.4",
+     "1:2:3:4::1.2.3.4",
+     "1:2:3::1.2.3.4",
+     "1:2::1.2.3.4",
+     "1::1.2.3.4",
+     "1:2:3:4::5:1.2.3.4",
+     "1:2:3::5:1.2.3.4",
+     "1:2::5:1.2.3.4",
+     "1::5:1.2.3.4",
+     "1::5:11.22.33.44",
+     "fe80::217:f2ff:254.7.237.98",
+     "::ffff:192.168.1.26",
+     "::ffff:192.168.1.1",
+     "0:0:0:0:0:0:13.1.68.3", # IPv4-compatible IPv6 address, full, deprecated
+     "0:0:0:0:0:FFFF:129.144.52.38", # IPv4-mapped IPv6 address, full
+     "::13.1.68.3",             # IPv4-compatible IPv6 address, compressed, deprecated
+     "::FFFF:129.144.52.38",    # IPv4-mapped IPv6 address, compressed
+     "fe80:0:0:0:204:61ff:254.157.241.86",
+     "fe80::204:61ff:254.157.241.86",
+     "::ffff:12.34.56.78",
+     "::ffff:192.0.2.128",      # this is OK, since there's a single zero digit in IPv4
+     "fe80:0000:0000:0000:0204:61ff:fe9d:f156",
+     "fe80:0:0:0:204:61ff:fe9d:f156",
+     "fe80::204:61ff:fe9d:f156",
+     "::1",
+     "fe80::",
+     "fe80::1",
+     "::ffff:c000:280",
+
+     # Additional test cases from http://rt.cpan.org/Public/Bug/Display.html?id=50693
+     "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
+     "2001:db8:85a3:0:0:8a2e:370:7334",
+     "2001:db8:85a3::8a2e:370:7334",
+     "2001:0db8:0000:0000:0000:0000:1428:57ab",
+     "2001:0db8:0000:0000:0000::1428:57ab",
+     "2001:0db8:0:0:0:0:1428:57ab",
+     "2001:0db8:0:0::1428:57ab",
+     "2001:0db8::1428:57ab",
+     "2001:db8::1428:57ab",
+     "0000:0000:0000:0000:0000:0000:0000:0001",
+     "::1",
+     "::ffff:0c22:384e",
+     "2001:0db8:1234:0000:0000:0000:0000:0000",
+     "2001:0db8:1234:ffff:ffff:ffff:ffff:ffff",
+     "2001:db8:a::123",
+     "fe80::",
+
+     "1111:2222:3333:4444:5555:6666:7777:8888",
+     "1111:2222:3333:4444:5555:6666:7777::",
+     "1111:2222:3333:4444:5555:6666::",
+     "1111:2222:3333:4444:5555::",
+     "1111:2222:3333:4444::",
+     "1111:2222:3333::",
+     "1111:2222::",
+     "1111::",
+     "1111:2222:3333:4444:5555:6666::8888",
+     "1111:2222:3333:4444:5555::8888",
+     "1111:2222:3333:4444::8888",
+     "1111:2222:3333::8888",
+     "1111:2222::8888",
+     "1111::8888",
+     "::8888",
+     "1111:2222:3333:4444:5555::7777:8888",
+     "1111:2222:3333:4444::7777:8888",
+     "1111:2222:3333::7777:8888",
+     "1111:2222::7777:8888",
+     "1111::7777:8888",
+     "::7777:8888",
+     "1111:2222:3333:4444::6666:7777:8888",
+     "1111:2222:3333::6666:7777:8888",
+     "1111:2222::6666:7777:8888",
+     "1111::6666:7777:8888",
+     "::6666:7777:8888",
+     "1111:2222:3333::5555:6666:7777:8888",
+     "1111:2222::5555:6666:7777:8888",
+     "1111::5555:6666:7777:8888",
+     "::5555:6666:7777:8888",
+     "1111:2222::4444:5555:6666:7777:8888",
+     "1111::4444:5555:6666:7777:8888",
+     "::4444:5555:6666:7777:8888",
+     "1111::3333:4444:5555:6666:7777:8888",
+     "::3333:4444:5555:6666:7777:8888",
+     "::2222:3333:4444:5555:6666:7777:8888",
+     "1111:2222:3333:4444:5555:6666:123.123.123.123",
+     "1111:2222:3333:4444:5555::123.123.123.123",
+     "1111:2222:3333:4444::123.123.123.123",
+     "1111:2222:3333::123.123.123.123",
+     "1111:2222::123.123.123.123",
+     "1111::123.123.123.123",
+     "::123.123.123.123",
+     "1111:2222:3333:4444::6666:123.123.123.123",
+     "1111:2222:3333::6666:123.123.123.123",
+     "1111:2222::6666:123.123.123.123",
+     "1111::6666:123.123.123.123",
+     "::6666:123.123.123.123",
+     "1111:2222:3333::5555:6666:123.123.123.123",
+     "1111:2222::5555:6666:123.123.123.123",
+     "1111::5555:6666:123.123.123.123",
+     "::5555:6666:123.123.123.123",
+     "1111:2222::4444:5555:6666:123.123.123.123",
+     "1111::4444:5555:6666:123.123.123.123",
+     "::4444:5555:6666:123.123.123.123",
+     "1111::3333:4444:5555:6666:123.123.123.123",
+     "::2222:3333:4444:5555:6666:123.123.123.123",
+
+     # Playing with combinations of "0" and "::"; these are all sytactically
+     # correct, but are bad form because "0" adjacent to "::" should be
+     # combined into "::"
+     "::0:0:0:0:0:0:0",
+     "::0:0:0:0:0:0",
+     "::0:0:0:0:0",
+     "::0:0:0:0",
+     "::0:0:0",
+     "::0:0",
+     "::0",
+     "0:0:0:0:0:0:0::",
+     "0:0:0:0:0:0::",
+     "0:0:0:0:0::",
+     "0:0:0:0::",
+     "0:0:0::",
+     "0:0::",
+     "0::",
+
+     # Additional cases: http://crisp.tweakblogs.net/blog/2031/ipv6-validation-%28and-caveats%29.html
+     "0:a:b:c:d:e:f::",
+     "::0:a:b:c:d:e:f", # syntactically correct, but bad form (::0:... could be combined)
+     "a:b:c:d:e:f:0::",
+    ].each do |ip|
+      it "should accept #{ip.inspect} as an IPv6 address" do
+        expect { @class.new(:name => "foo", :ip => ip) }.not_to raise_error
+      end
+    end
+
+    # ...aaaand, some failure cases.
+    [":",
+     "02001:0000:1234:0000:0000:C1C0:ABCD:0876",     # extra 0 not allowed!
+     "2001:0000:1234:0000:00001:C1C0:ABCD:0876",     # extra 0 not allowed!
+     "2001:0000:1234:0000:0000:C1C0:ABCD:0876  0",   # junk after valid address
+     "2001:0000:1234: 0000:0000:C1C0:ABCD:0876",     # internal space
+     "3ffe:0b00:0000:0001:0000:0000:000a",           # seven segments
+     "FF02:0000:0000:0000:0000:0000:0000:0000:0001", # nine segments
+     "3ffe:b00::1::a",                               # double "::"
+     "::1111:2222:3333:4444:5555:6666::",            # double "::"
+     "1:2:3::4:5::7:8",                              # Double "::"
+     "12345::6:7:8",
+     # IPv4 embedded, but bad...
+     "1::5:400.2.3.4", "1::5:260.2.3.4", "1::5:256.2.3.4", "1::5:1.256.3.4",
+     "1::5:1.2.256.4", "1::5:1.2.3.256", "1::5:300.2.3.4", "1::5:1.300.3.4",
+     "1::5:1.2.300.4", "1::5:1.2.3.300", "1::5:900.2.3.4", "1::5:1.900.3.4",
+     "1::5:1.2.900.4", "1::5:1.2.3.900", "1::5:300.300.300.300", "1::5:3000.30.30.30",
+     "1::400.2.3.4", "1::260.2.3.4", "1::256.2.3.4", "1::1.256.3.4",
+     "1::1.2.256.4", "1::1.2.3.256", "1::300.2.3.4", "1::1.300.3.4",
+     "1::1.2.300.4", "1::1.2.3.300", "1::900.2.3.4", "1::1.900.3.4",
+     "1::1.2.900.4", "1::1.2.3.900", "1::300.300.300.300", "1::3000.30.30.30",
+     "::400.2.3.4", "::260.2.3.4", "::256.2.3.4", "::1.256.3.4",
+     "::1.2.256.4", "::1.2.3.256", "::300.2.3.4", "::1.300.3.4",
+     "::1.2.300.4", "::1.2.3.300", "::900.2.3.4", "::1.900.3.4",
+     "::1.2.900.4", "::1.2.3.900", "::300.300.300.300", "::3000.30.30.30",
+     "2001:1:1:1:1:1:255Z255X255Y255", # garbage instead of "." in IPv4
+     "::ffff:192x168.1.26",            # ditto
+     "::ffff:2.3.4",
+     "::ffff:257.1.2.3",
+     "1.2.3.4:1111:2222:3333:4444::5555",
+     "1.2.3.4:1111:2222:3333::5555",
+     "1.2.3.4:1111:2222::5555",
+     "1.2.3.4:1111::5555",
+     "1.2.3.4::5555",
+     "1.2.3.4::",
+
+     # Testing IPv4 addresses represented as dotted-quads Leading zero's in
+     # IPv4 addresses not allowed: some systems treat the leading "0" in
+     # ".086" as the start of an octal number Update: The BNF in RFC-3986
+     # explicitly defines the dec-octet (for IPv4 addresses) not to have a
+     # leading zero
+     "fe80:0000:0000:0000:0204:61ff:254.157.241.086",
+     "XXXX:XXXX:XXXX:XXXX:XXXX:XXXX:1.2.3.4",
+     "1111:2222:3333:4444:5555:6666:00.00.00.00",
+     "1111:2222:3333:4444:5555:6666:000.000.000.000",
+     "1111:2222:3333:4444:5555:6666:256.256.256.256",
+
+     "1111:2222:3333:4444::5555:",
+     "1111:2222:3333::5555:",
+     "1111:2222::5555:",
+     "1111::5555:",
+     "::5555:",
+     ":::",
+     "1111:",
+     ":",
+
+     ":1111:2222:3333:4444::5555",
+     ":1111:2222:3333::5555",
+     ":1111:2222::5555",
+     ":1111::5555",
+     ":::5555",
+     ":::",
+
+     # Additional test cases from http://rt.cpan.org/Public/Bug/Display.html?id=50693
+     "123",
+     "ldkfj",
+     "2001::FFD3::57ab",
+     "2001:db8:85a3::8a2e:37023:7334",
+     "2001:db8:85a3::8a2e:370k:7334",
+     "1:2:3:4:5:6:7:8:9",
+     "1::2::3",
+     "1:::3:4:5",
+     "1:2:3::4:5:6:7:8:9",
+
+     # Invalid data
+     "XXXX:XXXX:XXXX:XXXX:XXXX:XXXX:XXXX:XXXX",
+
+     # Too many components
+     "1111:2222:3333:4444:5555:6666:7777:8888:9999",
+     "1111:2222:3333:4444:5555:6666:7777:8888::",
+     "::2222:3333:4444:5555:6666:7777:8888:9999",
+
+     # Too few components
+     "1111:2222:3333:4444:5555:6666:7777",
+     "1111:2222:3333:4444:5555:6666",
+     "1111:2222:3333:4444:5555",
+     "1111:2222:3333:4444",
+     "1111:2222:3333",
+     "1111:2222",
+     "1111",
+
+     # Missing :
+     "11112222:3333:4444:5555:6666:7777:8888",
+     "1111:22223333:4444:5555:6666:7777:8888",
+     "1111:2222:33334444:5555:6666:7777:8888",
+     "1111:2222:3333:44445555:6666:7777:8888",
+     "1111:2222:3333:4444:55556666:7777:8888",
+     "1111:2222:3333:4444:5555:66667777:8888",
+     "1111:2222:3333:4444:5555:6666:77778888",
+
+     # Missing : intended for ::
+     "1111:2222:3333:4444:5555:6666:7777:8888:",
+     "1111:2222:3333:4444:5555:6666:7777:",
+     "1111:2222:3333:4444:5555:6666:",
+     "1111:2222:3333:4444:5555:",
+     "1111:2222:3333:4444:",
+     "1111:2222:3333:",
+     "1111:2222:",
+     "1111:",
+     ":",
+     ":8888",
+     ":7777:8888",
+     ":6666:7777:8888",
+     ":5555:6666:7777:8888",
+     ":4444:5555:6666:7777:8888",
+     ":3333:4444:5555:6666:7777:8888",
+     ":2222:3333:4444:5555:6666:7777:8888",
+     ":1111:2222:3333:4444:5555:6666:7777:8888",
+
+     # :::
+     ":::2222:3333:4444:5555:6666:7777:8888",
+     "1111:::3333:4444:5555:6666:7777:8888",
+     "1111:2222:::4444:5555:6666:7777:8888",
+     "1111:2222:3333:::5555:6666:7777:8888",
+     "1111:2222:3333:4444:::6666:7777:8888",
+     "1111:2222:3333:4444:5555:::7777:8888",
+     "1111:2222:3333:4444:5555:6666:::8888",
+     "1111:2222:3333:4444:5555:6666:7777:::",
+
+     # Double ::",
+     "::2222::4444:5555:6666:7777:8888",
+     "::2222:3333::5555:6666:7777:8888",
+     "::2222:3333:4444::6666:7777:8888",
+     "::2222:3333:4444:5555::7777:8888",
+     "::2222:3333:4444:5555:7777::8888",
+     "::2222:3333:4444:5555:7777:8888::",
+
+     "1111::3333::5555:6666:7777:8888",
+     "1111::3333:4444::6666:7777:8888",
+     "1111::3333:4444:5555::7777:8888",
+     "1111::3333:4444:5555:6666::8888",
+     "1111::3333:4444:5555:6666:7777::",
+
+     "1111:2222::4444::6666:7777:8888",
+     "1111:2222::4444:5555::7777:8888",
+     "1111:2222::4444:5555:6666::8888",
+     "1111:2222::4444:5555:6666:7777::",
+
+     "1111:2222:3333::5555::7777:8888",
+     "1111:2222:3333::5555:6666::8888",
+     "1111:2222:3333::5555:6666:7777::",
+
+     "1111:2222:3333:4444::6666::8888",
+     "1111:2222:3333:4444::6666:7777::",
+
+     "1111:2222:3333:4444:5555::7777::",
+
+
+     # Too many components"
+     "1111:2222:3333:4444:5555:6666:7777:8888:1.2.3.4",
+     "1111:2222:3333:4444:5555:6666:7777:1.2.3.4",
+     "1111:2222:3333:4444:5555:6666::1.2.3.4",
+     "::2222:3333:4444:5555:6666:7777:1.2.3.4",
+     "1111:2222:3333:4444:5555:6666:1.2.3.4.5",
+
+     # Too few components
+     "1111:2222:3333:4444:5555:1.2.3.4",
+     "1111:2222:3333:4444:1.2.3.4",
+     "1111:2222:3333:1.2.3.4",
+     "1111:2222:1.2.3.4",
+     "1111:1.2.3.4",
+
+     # Missing :
+     "11112222:3333:4444:5555:6666:1.2.3.4",
+     "1111:22223333:4444:5555:6666:1.2.3.4",
+     "1111:2222:33334444:5555:6666:1.2.3.4",
+     "1111:2222:3333:44445555:6666:1.2.3.4",
+     "1111:2222:3333:4444:55556666:1.2.3.4",
+     "1111:2222:3333:4444:5555:66661.2.3.4",
+
+     # Missing .
+     "1111:2222:3333:4444:5555:6666:255255.255.255",
+     "1111:2222:3333:4444:5555:6666:255.255255.255",
+     "1111:2222:3333:4444:5555:6666:255.255.255255",
+
+     # Missing : intended for ::
+     ":1.2.3.4",
+     ":6666:1.2.3.4",
+     ":5555:6666:1.2.3.4",
+     ":4444:5555:6666:1.2.3.4",
+     ":3333:4444:5555:6666:1.2.3.4",
+     ":2222:3333:4444:5555:6666:1.2.3.4",
+     ":1111:2222:3333:4444:5555:6666:1.2.3.4",
+
+     # :::
+     ":::2222:3333:4444:5555:6666:1.2.3.4",
+     "1111:::3333:4444:5555:6666:1.2.3.4",
+     "1111:2222:::4444:5555:6666:1.2.3.4",
+     "1111:2222:3333:::5555:6666:1.2.3.4",
+     "1111:2222:3333:4444:::6666:1.2.3.4",
+     "1111:2222:3333:4444:5555:::1.2.3.4",
+
+     # Double ::
+     "::2222::4444:5555:6666:1.2.3.4",
+     "::2222:3333::5555:6666:1.2.3.4",
+     "::2222:3333:4444::6666:1.2.3.4",
+     "::2222:3333:4444:5555::1.2.3.4",
+
+     "1111::3333::5555:6666:1.2.3.4",
+     "1111::3333:4444::6666:1.2.3.4",
+     "1111::3333:4444:5555::1.2.3.4",
+
+     "1111:2222::4444::6666:1.2.3.4",
+     "1111:2222::4444:5555::1.2.3.4",
+
+     "1111:2222:3333::5555::1.2.3.4",
+
+     # Missing parts
+     "::.",
+     "::..",
+     "::...",
+     "::1...",
+     "::1.2..",
+     "::1.2.3.",
+     "::.2..",
+     "::.2.3.",
+     "::.2.3.4",
+     "::..3.",
+     "::..3.4",
+     "::...4",
+
+     # Extra : in front
+     ":1111:2222:3333:4444:5555:6666:7777::",
+     ":1111:2222:3333:4444:5555:6666::",
+     ":1111:2222:3333:4444:5555::",
+     ":1111:2222:3333:4444::",
+     ":1111:2222:3333::",
+     ":1111:2222::",
+     ":1111::",
+     ":::",
+     ":1111:2222:3333:4444:5555:6666::8888",
+     ":1111:2222:3333:4444:5555::8888",
+     ":1111:2222:3333:4444::8888",
+     ":1111:2222:3333::8888",
+     ":1111:2222::8888",
+     ":1111::8888",
+     ":::8888",
+     ":1111:2222:3333:4444:5555::7777:8888",
+     ":1111:2222:3333:4444::7777:8888",
+     ":1111:2222:3333::7777:8888",
+     ":1111:2222::7777:8888",
+     ":1111::7777:8888",
+     ":::7777:8888",
+     ":1111:2222:3333:4444::6666:7777:8888",
+     ":1111:2222:3333::6666:7777:8888",
+     ":1111:2222::6666:7777:8888",
+     ":1111::6666:7777:8888",
+     ":::6666:7777:8888",
+     ":1111:2222:3333::5555:6666:7777:8888",
+     ":1111:2222::5555:6666:7777:8888",
+     ":1111::5555:6666:7777:8888",
+     ":::5555:6666:7777:8888",
+     ":1111:2222::4444:5555:6666:7777:8888",
+     ":1111::4444:5555:6666:7777:8888",
+     ":::4444:5555:6666:7777:8888",
+     ":1111::3333:4444:5555:6666:7777:8888",
+     ":::3333:4444:5555:6666:7777:8888",
+     ":::2222:3333:4444:5555:6666:7777:8888",
+     ":1111:2222:3333:4444:5555:6666:1.2.3.4",
+     ":1111:2222:3333:4444:5555::1.2.3.4",
+     ":1111:2222:3333:4444::1.2.3.4",
+     ":1111:2222:3333::1.2.3.4",
+     ":1111:2222::1.2.3.4",
+     ":1111::1.2.3.4",
+     ":::1.2.3.4",
+     ":1111:2222:3333:4444::6666:1.2.3.4",
+     ":1111:2222:3333::6666:1.2.3.4",
+     ":1111:2222::6666:1.2.3.4",
+     ":1111::6666:1.2.3.4",
+     ":::6666:1.2.3.4",
+     ":1111:2222:3333::5555:6666:1.2.3.4",
+     ":1111:2222::5555:6666:1.2.3.4",
+     ":1111::5555:6666:1.2.3.4",
+     ":::5555:6666:1.2.3.4",
+     ":1111:2222::4444:5555:6666:1.2.3.4",
+     ":1111::4444:5555:6666:1.2.3.4",
+     ":::4444:5555:6666:1.2.3.4",
+     ":1111::3333:4444:5555:6666:1.2.3.4",
+     ":::2222:3333:4444:5555:6666:1.2.3.4",
+
+     # Extra : at end
+     "1111:2222:3333:4444:5555:6666:7777:::",
+     "1111:2222:3333:4444:5555:6666:::",
+     "1111:2222:3333:4444:5555:::",
+     "1111:2222:3333:4444:::",
+     "1111:2222:3333:::",
+     "1111:2222:::",
+     "1111:::",
+     ":::",
+     "1111:2222:3333:4444:5555:6666::8888:",
+     "1111:2222:3333:4444:5555::8888:",
+     "1111:2222:3333:4444::8888:",
+     "1111:2222:3333::8888:",
+     "1111:2222::8888:",
+     "1111::8888:",
+     "::8888:",
+     "1111:2222:3333:4444:5555::7777:8888:",
+     "1111:2222:3333:4444::7777:8888:",
+     "1111:2222:3333::7777:8888:",
+     "1111:2222::7777:8888:",
+     "1111::7777:8888:",
+     "::7777:8888:",
+     "1111:2222:3333:4444::6666:7777:8888:",
+     "1111:2222:3333::6666:7777:8888:",
+     "1111:2222::6666:7777:8888:",
+     "1111::6666:7777:8888:",
+     "::6666:7777:8888:",
+     "1111:2222:3333::5555:6666:7777:8888:",
+     "1111:2222::5555:6666:7777:8888:",
+     "1111::5555:6666:7777:8888:",
+     "::5555:6666:7777:8888:",
+     "1111:2222::4444:5555:6666:7777:8888:",
+     "1111::4444:5555:6666:7777:8888:",
+     "::4444:5555:6666:7777:8888:",
+     "1111::3333:4444:5555:6666:7777:8888:",
+     "::3333:4444:5555:6666:7777:8888:",
+     "::2222:3333:4444:5555:6666:7777:8888:",
+    ].each do |ip|
+      it "should reject #{ip.inspect} as an IPv6 address" do
+        expect { @class.new(:name => "foo", :ip => ip) }.to raise_error
+      end
+    end
+
     it "should not accept spaces in resourcename" do
       proc { @class.new(:name => "foo bar") }.should raise_error
     end