Make test monkey patching more robust

Author: xdg

t/002_croakage.t

@@ -5,7 +5,7 @@ use warnings;
 
 use Test::More;
 use lib 't';
-use Util qw[tmpfile monkey_patch set_socket_source];
+use Util qw[tmpfile monkey_patch set_socket_source clear_socket_source];
 
 use HTTP::Tiny;
 
@@ -35,6 +35,7 @@ my $res_fh = tmpfile();
 my $req_fh = tmpfile();
 
 my $http = HTTP::Tiny->new;
+clear_socket_source();
 set_socket_source($req_fh, $res_fh);
 
 for my $c ( @cases ) {

t/101_head.t

@@ -6,8 +6,8 @@ use warnings;
 use File::Basename;
 use Test::More 0.88;
 use lib 't';
-use Util  qw[tmpfile rewind slurp monkey_patch dir_list parse_case
-   set_socket_source sort_headers $CRLF $LF];
+use Util qw[tmpfile rewind slurp monkey_patch dir_list parse_case
+ clear_socket_source set_socket_source sort_headers $CRLF $LF];
 use HTTP::Tiny;
 BEGIN { monkey_patch() }
 
@@ -47,6 +47,7 @@ for my $file ( dir_list("corpus", qr/^head/ ) ) {
  my $req_fh = tmpfile();
 
  my $http = HTTP::Tiny->new( keep_alive => 0 );
+ clear_socket_source();
  set_socket_source($req_fh, $res_fh);
 
  (my $url_basename = $url) =~ s{.*/}{};

t/102_put.t

@@ -6,8 +6,8 @@ use warnings;
 use File::Basename;
 use Test::More 0.88;
 use lib 't';
-use Util  qw[tmpfile rewind slurp monkey_patch dir_list parse_case
-   set_socket_source sort_headers $CRLF $LF];
+use Util qw[tmpfile rewind slurp monkey_patch dir_list parse_case
+ clear_socket_source set_socket_source sort_headers $CRLF $LF];
 use HTTP::Tiny;
 BEGIN { monkey_patch() }
 
@@ -50,6 +50,7 @@ for my $file ( dir_list("corpus", qr/^put/ ) ) {
  my $req_fh = tmpfile();
 
  my $http = HTTP::Tiny->new( keep_alive => 0 );
+ clear_socket_source();
  set_socket_source($req_fh, $res_fh);
 
  (my $url_basename = $url) =~ s{.*/}{};

t/103_delete.t

@@ -6,8 +6,8 @@ use warnings;
 use File::Basename;
 use Test::More 0.88;
 use lib 't';
-use Util  qw[tmpfile rewind slurp monkey_patch dir_list parse_case
-   set_socket_source sort_headers $CRLF $LF];
+use Util qw[tmpfile rewind slurp monkey_patch dir_list parse_case
+ clear_socket_source set_socket_source sort_headers $CRLF $LF];
 use HTTP::Tiny;
 BEGIN { monkey_patch() }
 
@@ -47,6 +47,7 @@ for my $file ( dir_list("corpus", qr/^delete/ ) ) {
  my $req_fh = tmpfile();
 
  my $http = HTTP::Tiny->new( keep_alive => 0 );
+ clear_socket_source();
  set_socket_source($req_fh, $res_fh);
 
  (my $url_basename = $url) =~ s{.*/}{};

t/104_post.t

@@ -6,8 +6,8 @@ use warnings;
 use File::Basename;
 use Test::More 0.88;
 use lib 't';
-use Util  qw[tmpfile rewind slurp monkey_patch dir_list parse_case
-   set_socket_source sort_headers $CRLF $LF];
+use Util qw[tmpfile rewind slurp monkey_patch dir_list parse_case
+ clear_socket_source set_socket_source sort_headers $CRLF $LF];
 use HTTP::Tiny;
 BEGIN { monkey_patch() }
 
@@ -47,6 +47,7 @@ for my $file ( dir_list("corpus", qr/^post/ ) ) {
  my $req_fh = tmpfile();
 
  my $http = HTTP::Tiny->new( keep_alive => 0 );
+ clear_socket_source();
  set_socket_source($req_fh, $res_fh);
 
  (my $url_basename = $url) =~ s{.*/}{};

t/110_mirror.t

@@ -6,8 +6,8 @@ use warnings;
 use File::Basename;
 use Test::More 0.88;
 use lib 't';
-use Util  qw[tmpfile rewind slurp monkey_patch dir_list parse_case
-   set_socket_source sort_headers $CRLF $LF];
+use Util qw[tmpfile rewind slurp monkey_patch dir_list parse_case
+ clear_socket_source set_socket_source sort_headers $CRLF $LF];
 use HTTP::Tiny;
 use File::Temp qw/tempdir/;
 use File::Spec;
@@ -64,6 +64,7 @@ for my $file ( dir_list("corpus", qr/^mirror/ ) ) {
  my $req_fh = tmpfile();
 
  my $http = HTTP::Tiny->new( keep_alive => 0 );
+ clear_socket_source();
  set_socket_source($req_fh, $res_fh);
 
  my @call_args = %options ? ($url, $tempfile, \%options) : ($url, $tempfile);

t/150_post_form.t

@@ -7,8 +7,8 @@ use open IN => ':raw';
 use File::Basename;
 use Test::More 0.88;
 use lib 't';
-use Util  qw[tmpfile rewind slurp monkey_patch dir_list parse_case
-   set_socket_source sort_headers $CRLF $LF];
+use Util qw[tmpfile rewind slurp monkey_patch dir_list parse_case
+ clear_socket_source set_socket_source sort_headers $CRLF $LF];
 use HTTP::Tiny;
 BEGIN { monkey_patch() }
 
@@ -61,6 +61,7 @@ for my $file ( dir_list("corpus", qr/^form/ ) ) {
  my $req_fh = tmpfile();
 
  my $http = HTTP::Tiny->new( keep_alive => 0 );
+ clear_socket_source();
  set_socket_source($req_fh, $res_fh);
 
  (my $url_basename = $url) =~ s{.*/}{};