[gentoo-commits] proj/perl-overlay:master commit in: dev-perl/Test-WWW-Mechanize/, dev-perl/Test-WWW-Mechanize/files/1.30/

[Kent Fredric]

commit:     f454abe2d3fd99b57189dde2de511c1945d23043
Author:     Kent Fredric <kentfredric <AT> gmail <DOT> com>
AuthorDate: Sun May  1 07:06:12 2011 +0000
Commit:     Kent Fredric <kentfredric <AT> gmail <DOT> com>
CommitDate: Sun May  1 07:06:12 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/perl-overlay.git;a=commit;h=f454abe2

[fix] regenerate -r2 patch to TWM to actually work

(Portage version: 2.2.0_alpha30/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0A0CB301)

---
 dev-perl/Test-WWW-Mechanize/ChangeLog              |    4 +
 .../Test-WWW-Mechanize/files/1.30/fix_dns-r2.patch |   84 ++++++++------------
 2 files changed, 38 insertions(+), 50 deletions(-)

diff --git a/dev-perl/Test-WWW-Mechanize/ChangeLog b/dev-perl/Test-WWW-Mechanize/ChangeLog
index 03500a1..104ae66 100644
--- a/dev-perl/Test-WWW-Mechanize/ChangeLog
+++ b/dev-perl/Test-WWW-Mechanize/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-WWW-Mechanize/ChangeLog,v 1.34 2011/01/04 19:11:47 tove Exp $
 
+  01 May 2011; Kent Fredric <kentfredric@×××××.com>
+  files/1.30/fix_dns-r2.patch:
+  Regenerate patch to actually work
+
 *Test-WWW-Mechanize-1.30-r2 (01 May 2011)
 
   01 May 2011; Kent Fredric <kentfredric@×××××.com>

diff --git a/dev-perl/Test-WWW-Mechanize/files/1.30/fix_dns-r2.patch b/dev-perl/Test-WWW-Mechanize/files/1.30/fix_dns-r2.patch
index e13d18c..ccfac4c 100644
--- a/dev-perl/Test-WWW-Mechanize/files/1.30/fix_dns-r2.patch
+++ b/dev-perl/Test-WWW-Mechanize/files/1.30/fix_dns-r2.patch
@@ -1,3 +1,31 @@
+diff --git a/Changes b/Changes
+index b796ca8..54ad52d 100644
+--- a/Changes
++++ b/Changes
+@@ -15,6 +15,10 @@ Added $mech->text_contains(), $mech->text_like() and $mech->text_unlike()
+ methods.  These check the text of an HTML page separate from the
+ HTML markup.  Thanks to Ashley Pond V.
+ 
++[FIXED]
++t/head_ok.t should no longer fail if your ISP "helpfully" returns
++an IP address for non-existent DNS records.  Thanks, Schwern.
++
+ 
+ 1.28    Tue Apr 13 00:44:27 CDT 2010
+ ------------------------------------
+diff --git a/Mechanize.pm b/Mechanize.pm
+index 1489344..3f4d54a 100644
+--- a/Mechanize.pm
++++ b/Mechanize.pm
+@@ -100,7 +100,7 @@ called.
+ 
+ =back
+ 
+-This means you no longerhave to do the following:
++This means you no longer have to do the following:
+ 
+     my $mech = Test::WWW::Mechanize->new();
+     $mech->get_ok( $url, 'Fetch the intro page' );
 diff --git a/t/back_ok.t b/t/back_ok.t
 index 7042c90..d59df9e 100644
 --- a/t/back_ok.t
@@ -54,66 +82,22 @@ index 4df896f..f61ab81 100644
      test_test( 'Fails to get nonexistent URI and reports failure' );
  
 diff --git a/t/head_ok.t b/t/head_ok.t
-index 4557e83..bbfc062 100644
+index c123e70..bbfc062 100644
 --- a/t/head_ok.t
 +++ b/t/head_ok.t
-@@ -2,12 +2,21 @@
- 
- use strict;
- use warnings;
--use Test::More tests => 11;
-+use Test::More;
- use Test::Builder::Tester;
- 
--my $NONEXISTENT = 'blahblablah.xx-nonexistent.foo';
-+use constant NONEXISTENT => 'http://blahblablah.xx-nonexistent.';
-+BEGIN {
-+    if ( gethostbyname( NONEXISTENT ) ) {
-+        plan skip_all => 'Found an A record for the non-existent domain';
-+    }
-+}
-+
-+BEGIN {
-+    plan tests => 11;
-+    use_ok( 'Test::WWW::Mechanize' );
-+}
- 
--require_ok( 'Test::WWW::Mechanize' );
- 
- use lib 't';
- use TestServer;
-@@ -16,7 +25,7 @@ my $server      = TestServer->new;
- my $pid         = $server->background;
- my $server_root = $server->root;
- 
--my $mech = Test::WWW::Mechanize->new( autocheck => 0 );
-+my $mech=Test::WWW::Mechanize->new( autocheck => 0 );
- isa_ok($mech,'Test::WWW::Mechanize');
- 
- GOOD_HEAD: { # Stop giggling, you!
-@@ -37,22 +46,15 @@ GOOD_HEAD: { # Stop giggling, you!
-     test_test('HEAD existing URI and reports success - default desc');
+@@ -47,14 +47,14 @@ GOOD_HEAD: { # Stop giggling, you!
  }
  
--# Bad HEAD test. Relies on getting an error finding a non-existent domain.
--# Some ISPs "helpfully" provide resolution for non-existent domains,
--# and thus this test fails by succeeding.  We check for this annoying
--# behavior and skip this subtest if we get it.
--SKIP: {
--    skip "Found an A record for the non-existent domain $NONEXISTENT", 4
--        if gethostbyname $NONEXISTENT;
--
--    my $badurl = "http://$NONEXISTENT/";
-+BAD_HEAD: {
+ BAD_HEAD: {
+-    my $badurl = 'http://wango.nonexistent.xx-only-testing/';
 +    my $badurl = 'http://wango.nonexistent.xx-only-testing./';
      $mech->head($badurl);
--    ok(!$mech->success, q{sanity check: we can't load $badurl} );
-+    ok(!$mech->success, q{sanity check: we can't load NONEXISTENT.html} );
+     ok(!$mech->success, q{sanity check: we can't load NONEXISTENT.html} );
  
      test_out( 'not ok 1 - Try to HEAD bad URL' );
      test_fail( +3 );
      test_diag( '500' );
--    test_diag( qq{Can't connect to $NONEXISTENT:80 (Bad hostname '$NONEXISTENT')} );
+-    test_diag( q{Can't connect to wango.nonexistent.xx-only-testing:80 (Bad hostname 'wango.nonexistent.xx-only-testing')} );
 +    test_diag( q{Can't connect to wango.nonexistent.xx-only-testing.:80 (Bad hostname)} );
      my $ok = $mech->head_ok( $badurl, 'Try to HEAD bad URL' );
      test_test( 'Fails to HEAD nonexistent URI and reports failure' );