@@ -2,26 +2,25 @@ package MetaCPAN::TestServer;
2
2
3
3
use MetaCPAN::Moose;
4
4
5
- use MetaCPAN::Config ();
6
- use MetaCPAN::DarkPAN ();
7
- use MetaCPAN::Script::Author ();
8
- use MetaCPAN::Script::Cover ();
9
- use MetaCPAN::Script::CPANTestersAPI ();
10
- use MetaCPAN::Script::Favorite ();
11
- use MetaCPAN::Script::First ();
12
- use MetaCPAN::Script::Latest ();
13
- use MetaCPAN::Script::Mapping ();
14
- use MetaCPAN::Script::Mapping::Cover ();
15
- use MetaCPAN::Script::Mirrors ();
16
- use MetaCPAN::Script::Package ();
17
- use MetaCPAN::Script::Permission ();
18
- use MetaCPAN::Script::Release ();
19
- use MetaCPAN::Server ();
20
- use MetaCPAN::TestHelpers qw( fakecpan_dir ) ;
21
- use MetaCPAN::Types::TypeTiny qw( Path HashRef Str ) ;
22
- use Search::Elasticsearch;
23
- use Search::Elasticsearch::TestServer;
24
- use Test::More;
5
+ use MetaCPAN::Config ();
6
+ use MetaCPAN::Script::Author ();
7
+ use MetaCPAN::Script::Cover ();
8
+ use MetaCPAN::Script::CPANTestersAPI ();
9
+ use MetaCPAN::Script::Favorite ();
10
+ use MetaCPAN::Script::First ();
11
+ use MetaCPAN::Script::Latest ();
12
+ use MetaCPAN::Script::Mapping ();
13
+ use MetaCPAN::Script::Mapping::Cover ();
14
+ use MetaCPAN::Script::Mirrors ();
15
+ use MetaCPAN::Script::Package ();
16
+ use MetaCPAN::Script::Permission ();
17
+ use MetaCPAN::Script::Release ();
18
+ use MetaCPAN::Server ();
19
+ use MetaCPAN::TestHelpers qw( fakecpan_dir ) ;
20
+ use MetaCPAN::Types::TypeTiny qw( HashRef Path Str ) ;
21
+ use Search::Elasticsearch ();
22
+ use Search::Elasticsearch::TestServer ();
23
+ use Test::More import => [qw( BAIL_OUT diag is note ok subtest ) ];
25
24
use Try::Tiny qw( catch try ) ;
26
25
27
26
has es_client => (
@@ -83,14 +82,12 @@ sub _build_config {
83
82
sub _build_es_home {
84
83
my $self = shift ;
85
84
86
- my $es_home = $ENV {ES_TEST }
87
- || MetaCPAN::Config::config()-> {elasticsearch_servers };
85
+ my $es_home = MetaCPAN::Config::config()-> {elasticsearch_servers };
88
86
89
87
if ( !$es_home ) {
90
- my $es_home = $ENV {ES_HOME } or die <<'USAGE' ;
91
- Please set ${ES_TEST} to a running instance of Elasticsearch, eg
92
- 'localhost:9200' or set $ENV{ES_HOME} to the directory containing
93
- Elasticsearch
88
+ die <<'USAGE' ;
89
+ Please set elasticsearch_servers to a running instance of Elasticsearch, eg
90
+ 'localhost:9200'
94
91
USAGE
95
92
}
96
93
@@ -119,7 +116,7 @@ sub _build_es_server {
119
116
diag ' Connecting to Elasticsearch on ' . $self -> _es_home;
120
117
121
118
try {
122
- $ENV { ES_TEST } = $ server-> start-> [0];
119
+ $server -> start-> [0];
123
120
}
124
121
catch {
125
122
diag(<<"EOF" );
0 commit comments