Ensure that ENV{ES} is passed down through all tests called by fakecp…

…an.t
metacpan · Apr 16, 2015 · 9222640 · 9222640
1 parent 770a199
commit 9222640
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/etc/metacpan_testing.pl b/etc/metacpan_testing.pl
@@ -1,5 +1,5 @@
 {
-    es => ':' . ($ENV{METACPAN_ES_TEST_PORT} ||= 9900),
+    es => ($ENV{ES} || 'localhost:9900'),
     port => '5900',
     level => ($ENV{TEST_VERBOSE} ? 'info' : 'warn'),
     cpan => 't/var/tmp/fakecpan',

diff --git a/lib/MetaCPAN/Server/Test.pm b/lib/MetaCPAN/Server/Test.pm
@@ -74,7 +74,7 @@ require MetaCPAN::Model;
 
 sub model {
     MetaCPAN::Model->new(
-        es => q[:] . ( $ENV{METACPAN_ES_TEST_PORT} ||= 9900 ) );
+        es => ( $ENV{ES} ||= 'localhost:9900' ) );
 }
 
 1;

diff --git a/metacpan_server_testing.conf b/metacpan_server_testing.conf
@@ -2,15 +2,15 @@ cpan t/var/tmp/fakecpan
 source_base t/var/tmp/source
 
 <model CPAN>
-    servers :9900
+    servers __ENV(ES)__
 </model CPAN>
 
 <model User>
-    servers :9900
+    servers __ENV(ES)__
 </model User>
 
 <plugin Session>
-    servers :9900
+    servers __ENV(ES)__
 </plugin>
 
 <controller User::Turing>

diff --git a/t/fakecpan.t b/t/fakecpan.t
@@ -29,7 +29,7 @@ USAGE
         "cluster.name" => 'metacpan-test',
     );
 
-    $ES_HOST = $server->start->[0];
+    $ENV{ES} = $ES_HOST = $server->start->[0];
 }
 
 diag "Connecting to Elasticsearch on $ES_HOST";