File tree 4 files changed +6
-5
lines changed
4 files changed +6
-5
lines changed Original file line number Diff line number Diff line change 15
15
# We use a non-standard port to avoid trashing production
16
16
# but travis will have it running on the standard port.
17
17
- ES=localhost:9200
18
+ - ES_TEST=localhost:9200
18
19
19
20
# Instantiate Catalyst models using metacpan_server_testing.conf
20
21
- METACPAN_SERVER_CONFIG_LOCAL_SUFFIX=testing
Original file line number Diff line number Diff line change 1
1
{
2
- es => ($ ENV {ES } || ' localhost:9900' ),
2
+ es => ($ ENV {ES_TEST } || ' localhost:9900' ),
3
3
port => ' 5900' ,
4
4
die_on_error => 1 ,
5
5
level => ($ ENV {TEST_VERBOSE} ? ' info' : ' warn' ),
Original file line number Diff line number Diff line change @@ -40,7 +40,7 @@ sub app {
40
40
require MetaCPAN::Model;
41
41
42
42
sub model {
43
- MetaCPAN::Model-> new( es => ( $ENV {ES } ||= ' localhost:9900 ' ) );
43
+ MetaCPAN::Model-> new( es => ( $ENV {ES_TEST } ||= ' localhost:9200 ' ) );
44
44
}
45
45
46
46
1;
Original file line number Diff line number Diff line change @@ -79,11 +79,11 @@ sub _build_config {
79
79
sub _build_es_home {
80
80
my $self = shift ;
81
81
82
- my $es_home = $ENV {ES };
82
+ my $es_home = $ENV {ES_TEST };
83
83
84
84
if ( !$es_home ) {
85
85
my $es_home = $ENV {ES_HOME } or die <<'USAGE' ;
86
- Please set $ENV{ES } to a running instance of Elasticsearch, eg
86
+ Please set ${ES_TEST } to a running instance of Elasticsearch, eg
87
87
'localhost:9200' or set $ENV{ES_HOME} to the directory containing
88
88
Elasticsearch
89
89
USAGE
@@ -114,7 +114,7 @@ sub _build_es_server {
114
114
diag ' Connecting to Elasticsearch on ' . $self -> _es_home;
115
115
116
116
try {
117
- $ENV {ES } = $server -> start-> [0];
117
+ $ENV {ES_TEST } = $server -> start-> [0];
118
118
}
119
119
catch {
120
120
diag(<<"EOF" );
You can’t perform that action at this time.
0 commit comments