EmptyPort: isolate our own version of EmptyPort

so we can try seeing if it is the problem
fastmail · Feb 8, 2024 · ee5d0f8 · ee5d0f8
1 parent a4c1678
commit ee5d0f8
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 15 deletions.
diff --git a/t/dates.t b/t/dates.t
@@ -5,7 +5,7 @@ use utf8;
 
 use experimental qw( signatures );
 
-use lib 'lib';
+use lib 'lib', 't/lib';
 
 use Test::More;
 
@@ -15,7 +15,7 @@ use IO::Async::Loop;
 use IO::Async::Test;
 use IO::Async::Timer::Periodic;
 use Net::Async::HTTP;
-use Net::EmptyPort qw(empty_port);
+use Synergy::Test::EmptyPort qw(empty_port);
 use Synergy::Hub;
 
 # Initialize Synergy.

diff --git a/t/exclusive.t b/t/exclusive.t
@@ -2,7 +2,7 @@
 use v5.32.0;
 use warnings;
 
-use lib 'lib';
+use lib 'lib', 't/lib';
 
 use Test::More;
 
@@ -12,7 +12,7 @@ use IO::Async::Loop;
 use IO::Async::Test;
 use IO::Async::Timer::Periodic;
 use Net::Async::HTTP;
-use Net::EmptyPort qw(empty_port);
+use Synergy::Test::EmptyPort qw(empty_port);
 use Synergy::Hub;
 
 # Initialize Synergy.

diff --git a/t/httpendpoint.t b/t/httpendpoint.t
@@ -3,7 +3,7 @@
 use v5.32.0;
 use warnings;
 
-use lib 'lib';
+use lib 'lib', 't/lib';
 
 use Test::More;
 
@@ -13,7 +13,7 @@ use IO::Async::Loop;
 use IO::Async::Test;
 use IO::Async::Timer::Periodic;
 use Net::Async::HTTP;
-use Net::EmptyPort qw(empty_port);
+use Synergy::Test::EmptyPort qw(empty_port);
 use Plack::Response;
 use MIME::Base64 'encode_base64';
 use Synergy::Hub;

diff --git a/t/https.t b/t/https.t
@@ -3,7 +3,7 @@
 use v5.32.0;
 use warnings;
 
-use lib 'lib';
+use lib 'lib', 't/lib';
 
 use Test::More;
 
@@ -13,7 +13,7 @@ use IO::Async::Loop;
 use IO::Async::Test;
 use IO::Async::Timer::Periodic;
 use Net::Async::HTTP;
-use Net::EmptyPort qw(empty_port);
+use Synergy::Test::EmptyPort qw(empty_port);
 use Plack::Response;
 use Synergy::Hub;
 

diff --git a/t/httpserver.t b/t/httpserver.t
@@ -3,7 +3,7 @@
 use v5.32.0;
 use warnings;
 
-use lib 'lib';
+use lib 'lib', 't/lib';
 
 use Test::More;
 
@@ -13,7 +13,7 @@ use IO::Async::Loop;
 use IO::Async::Test;
 use IO::Async::Timer::Periodic;
 use Net::Async::HTTP;
-use Net::EmptyPort qw(empty_port);
+use Synergy::Test::EmptyPort qw(empty_port);
 use Plack::Response;
 use Synergy::Hub;
 

diff --git a/t/lib/Synergy/Test/EmptyPort.pm b/t/lib/Synergy/Test/EmptyPort.pm
@@ -0,0 +1,19 @@
+package Synergy::Test::EmptyPort;
+use strict;
+use warnings;
+
+use experimental qw(signatures);
+
+use Net::EmptyPort ();
+
+use Sub::Exporter -setup => [ qw(empty_port) ];
+
+sub empty_port () {
+  if ($ENV{GITHUB_ACTIONS}) {
+    return 60606;
+  }
+
+  return Net::EmptyPort::empty_port();
+}
+
+1;
diff --git a/t/lib/Synergy/Tester.pm b/t/lib/Synergy/Tester.pm
@@ -8,7 +8,7 @@ use Synergy::Logger::Test '$Logger';
 
 use IO::Async::Test;
 use Synergy::Hub;
-use Net::EmptyPort qw(empty_port);
+use Synergy::Test::EmptyPort qw(empty_port);
 
 package Synergy::Tester::Result {
 

diff --git a/t/page.t b/t/page.t
@@ -2,7 +2,7 @@
 use v5.32.0;
 use warnings;
 
-use lib 'lib';
+use lib 'lib', 't/lib';
 
 use Test::More;
 
@@ -12,7 +12,7 @@ use IO::Async::Loop;
 use IO::Async::Test;
 use IO::Async::Timer::Periodic;
 use Net::Async::HTTP;
-use Net::EmptyPort qw(empty_port);
+use Synergy::Test::EmptyPort qw(empty_port);
 use Path::Tiny ();
 use Synergy::Hub;
 

diff --git a/t/prometheus.t b/t/prometheus.t
@@ -3,7 +3,7 @@
 use v5.32.0;
 use warnings;
 
-use lib 'lib';
+use lib 'lib', 't/lib';
 
 use Test::More;
 
@@ -13,7 +13,7 @@ use IO::Async::Loop;
 use IO::Async::Test;
 use IO::Async::Timer::Periodic;
 use Net::Async::HTTP;
-use Net::EmptyPort qw(empty_port);
+use Synergy::Test::EmptyPort qw(empty_port);
 use Synergy::Hub;
 
 # Initialize Synergy.