Merge pull request basho#36 from basho/az686-be-systest-eunit

Update eunit tests to work with basho_expect
snoopaloop · Sep 15, 2011 · c5c502c · c5c502c
2 parents cc27dc2 + d813bf9
commit c5c502c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/riakc_pb_socket.erl b/src/riakc_pb_socket.erl
@@ -1354,12 +1354,12 @@ decode_mapred_resp(Data, <<"application/x-erlang-binary">>) ->
 -include_lib("eunit/include/eunit.hrl").
 -include("riakc_obj.hrl").
 
-%% Get the test host - check env RIAK_TEST_PB_HOST then env 'RIAK_TEST_HOST'
+%% Get the test host - check env RIAK_TEST_PB_HOST then env 'RIAK_TEST_HOST_1'
 %% falling back to 127.0.0.1
 test_ip() ->
     case os:getenv("RIAK_TEST_PB_HOST") of
         false ->
-            case os:getenv("RIAK_TEST_HOST") of
+            case os:getenv("RIAK_TEST_HOST_1") of
                 false ->
                     "127.0.0.1";
                 Host ->
@@ -1369,9 +1369,9 @@ test_ip() ->
             Host
     end.
 
-%% Test port - check env RIAK_TEST_PB_PORT
+%% Test port - check env RIAK_TEST_PBC_1
 test_port() ->
-    case os:getenv("RIAK_TEST_PB_PORT") of
+    case os:getenv("RIAK_TEST_PBC_1") of
         false ->
             8087;
         PortStr ->
@@ -1380,7 +1380,7 @@ test_port() ->
 
 %% Riak node under test - used to setup/configure/tweak it for tests
 test_riak_node() ->
-    case os:getenv("RIAK_TEST_NODE") of
+    case os:getenv("RIAK_TEST_NODE_1") of
         false ->
             'riak@127.0.0.1';
         NodeStr ->