Skip to content

Commit 933d084

Browse files
committed
Stop using ES_TEST
1 parent 6eb52d0 commit 933d084

File tree

3 files changed

+25
-31
lines changed

3 files changed

+25
-31
lines changed

etc/metacpan_testing.pl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
{
2-
es => ($ENV{ES_TEST} || 'localhost:9900'),
3-
port => '5900',
42
die_on_error => 1,
53
level => ($ENV{TEST_VERBOSE} ? 'info' : 'warn'),
64
cpan => 'var/t/tmp/fakecpan',

t/lib/MetaCPAN/Server/Test.pm

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ require MetaCPAN::Model;
4343
sub model {
4444
MetaCPAN::Model->new(
4545
es => (
46-
$ENV{ES_TEST}
47-
||= MetaCPAN::Config::config()->{elasticsearch_servers}
46+
nodes => [ MetaCPAN::Config::config()->{elasticsearch_servers} ]
4847
)
4948
);
5049
}

t/lib/MetaCPAN/TestServer.pm

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,25 @@ package MetaCPAN::TestServer;
22

33
use MetaCPAN::Moose;
44

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 )];
2524
use Try::Tiny qw( catch try );
2625

2726
has es_client => (
@@ -83,14 +82,12 @@ sub _build_config {
8382
sub _build_es_home {
8483
my $self = shift;
8584

86-
my $es_home = $ENV{ES_TEST}
87-
|| MetaCPAN::Config::config()->{elasticsearch_servers};
85+
my $es_home = MetaCPAN::Config::config()->{elasticsearch_servers};
8886

8987
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'
9491
USAGE
9592
}
9693

@@ -119,7 +116,7 @@ sub _build_es_server {
119116
diag 'Connecting to Elasticsearch on ' . $self->_es_home;
120117

121118
try {
122-
$ENV{ES_TEST} = $server->start->[0];
119+
$server->start->[0];
123120
}
124121
catch {
125122
diag(<<"EOF");

0 commit comments

Comments
 (0)