Stop using ES_TEST

Author: oalders

t/lib/MetaCPAN/Server/Test.pm

@@ -43,8 +43,7 @@ use MetaCPAN::Model ();
 sub model {
     MetaCPAN::Model->new(
         es => (
-            $ENV{ES_TEST}
-                ||= MetaCPAN::Config::config()->{elasticsearch_servers}
+            nodes => [ MetaCPAN::Config::config()->{elasticsearch_servers} ]
         )
     );
 }

t/lib/MetaCPAN/TestServer.pm

@@ -15,13 +15,14 @@ use MetaCPAN::Script::Mirrors         ();
 use MetaCPAN::Script::Package         ();
 use MetaCPAN::Script::Permission      ();
 use MetaCPAN::Script::Release         ();
+use MetaCPAN::Server ();
 use MetaCPAN::Server                  ();
-use MetaCPAN::TestHelpers             qw( fakecpan_dir );
+use MetaCPAN::TestHelpers             qw( catch fakecpan_dir try );
 use MetaCPAN::Types::TypeTiny         qw( HashRef Path Str );
 use Search::Elasticsearch             ();
 use Search::Elasticsearch::TestServer ();
 use Test::More;
-use Try::Tiny qw( catch try );
+use Test::More import => [qw( BAIL_OUT diag is note ok subtest )];
 
 has es_client => (
     is      => 'ro',
@@ -82,14 +83,12 @@ sub _build_config {
 sub _build_es_home {
     my $self = shift;
 
-    my $es_home = $ENV{ES_TEST}
-        || MetaCPAN::Config::config()->{elasticsearch_servers};
+    my $es_home = MetaCPAN::Config::config()->{elasticsearch_servers};
 
     if ( !$es_home ) {
-        my $es_home = $ENV{ES_HOME} or die <<'USAGE';
-Please set ${ES_TEST} to a running instance of Elasticsearch, eg
-'localhost:9200' or set $ENV{ES_HOME} to the directory containing
-Elasticsearch
+        die <<'USAGE';
+Please set elasticsearch_servers to a running instance of Elasticsearch, eg
+'localhost:9200'
 USAGE
     }
 
@@ -118,7 +117,7 @@ sub _build_es_server {
     diag 'Connecting to Elasticsearch on ' . $self->_es_home;
 
     try {
-        $ENV{ES_TEST} = $server->start->[0];
+        $server->start->[0];
     }
     catch {
         diag(<<"EOF");