Sophie

Sophie

distrib > Fedora > 14 > x86_64 > media > updates-src > by-pkgid > d77f0807553df29e25cf2119396897a4 > files > 3

erlang-riak_client-1.1.0-2.fc14.src.rpm

From b092298ee07773a4275f0c956a6ea4fff5175199 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Thu, 25 Nov 2010 17:44:59 +0300
Subject: [PATCH 2/3] Fixed several more unit-tests

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
 src/riakc_pb.erl        |    4 ++++
 src/riakc_pb_socket.erl |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/riakc_pb.erl b/src/riakc_pb.erl
index 9a18d94..b7eb8cc 100644
--- a/src/riakc_pb.erl
+++ b/src/riakc_pb.erl
@@ -286,6 +286,10 @@ pbify_bool(N) when is_integer(N) ->
 erlify_bool(0) ->
     false;
 erlify_bool(1) ->
+    true;
+erlify_bool(false) ->
+    false;
+erlify_bool(true) ->
     true.
 
 %% Make sure an atom/string/binary is definitely a binary
diff --git a/src/riakc_pb_socket.erl b/src/riakc_pb_socket.erl
index 5eacad9..6da6bc6 100644
--- a/src/riakc_pb_socket.erl
+++ b/src/riakc_pb_socket.erl
@@ -1252,7 +1252,7 @@ maybe_start_network() ->
 
 bad_connect_test() ->
     %% Start with an unlikely port number
-    ?assertEqual({error, {tcp, econnrefused}}, start({127,0,0,1}, 65535)).
+    ?assertEqual({error, {tcp, {tcp, econnrefused}}}, start({127,0,0,1}, 65535)).
 
 queue_disconnected_test() ->
     %% Start with an unlikely port number
@@ -1264,7 +1264,7 @@ queue_disconnected_test() ->
 auto_reconnect_bad_connect_test() ->
     %% Start with an unlikely port number
     {ok, Pid} = start({127,0,0,1}, 65535, [auto_reconnect]),
-    ?assertEqual({false, [{econnrefused,1}]}, is_connected(Pid)),
+    ?assertEqual({false, [{{tcp,econnrefused},1}]}, is_connected(Pid)),
     ?assertEqual({error, disconnected}, ping(Pid)),
     ?assertEqual({error, disconnected}, list_keys(Pid, <<"b">>)),
     stop(Pid).
-- 
1.7.4.1