From a0161388321c93d610556dc3caea4d9a2a90f818 Mon Sep 17 00:00:00 2001 From: joewilliams Date: Tue, 31 May 2011 15:10:49 -0700 Subject: [PATCH 1/3] sort the lists to make sure all keys exist --- test/erldis_tests.erl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/erldis_tests.erl b/test/erldis_tests.erl index ffbe526..38d0af7 100644 --- a/test/erldis_tests.erl +++ b/test/erldis_tests.erl @@ -29,7 +29,8 @@ basic_test() -> erldis:set(Client,<<"foo1">>,<<"bar">>), erldis:set(Client,<<"foo2">>,<<"bar">>), erldis:set(Client,<<"foo3">>,<<"bar">>), - ?assertEqual([<<"foo">>,<<"foo1">>,<<"foo2">>,<<"foo3">>], erldis:keys(Client, <<"f*">>)), + ?assertEqual(lists:sort([<<"foo">>,<<"foo1">>,<<"foo2">>,<<"foo3">>]), + lists:sort(erldis:keys(Client, <<"f*">>))), erldis:set(Client,<<"quux">>,<<"ohai">>), ?assertEqual([<<"quux">>], erldis:keys(Client, <<"q*">>)), From 05754ea469af7d411a8b7541e6d951beaccd9fa0 Mon Sep 17 00:00:00 2001 From: joewilliams Date: Tue, 31 May 2011 15:28:05 -0700 Subject: [PATCH 2/3] remove time outs from blpop test --- test/erldis_list_tests.erl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/erldis_list_tests.erl b/test/erldis_list_tests.erl index 03c4a08..209159d 100644 --- a/test/erldis_list_tests.erl +++ b/test/erldis_list_tests.erl @@ -87,11 +87,11 @@ blocking_queue_test() -> ?assertEqual([<<"a">>, <<"second">>], erldis:blpop(Client, [<<"a">>, <<"b">>])), spawn_link(fun blocking_queue_sender/0), - ?assertEqual([<<"a">>, <<1>>], erldis:blpop(Client, [<<"a">>, <<"b">>], 1000)), - ?assertEqual([<<"b">>, <<1>>], erldis:blpop(Client, [<<"a">>, <<"b">>], 1000)), - ?assertEqual([<<"a">>, <<2>>], erldis:blpop(Client, [<<"a">>, <<"b">>], 1000)), - ?assertEqual([], erldis:blpop(Client, [<<"a">>, <<"b">>], 1000)), - ?assertEqual([<<"a">>, <<3>>], erldis:blpop(Client, [<<"a">>, <<"b">>], 1000)), + ?assertEqual([<<"a">>, <<1>>], erldis:blpop(Client, [<<"a">>, <<"b">>])), + ?assertEqual([<<"b">>, <<1>>], erldis:blpop(Client, [<<"a">>, <<"b">>])), + ?assertEqual([<<"a">>, <<2>>], erldis:blpop(Client, [<<"a">>, <<"b">>])), + ?assertEqual([], erldis:blpop(Client, [<<"a">>, <<"b">>])), + ?assertEqual([<<"a">>, <<3>>], erldis:blpop(Client, [<<"a">>, <<"b">>])), erldis_client:stop(Client). From 6500c108b86174545e94ff16556aed1e572fb63c Mon Sep 17 00:00:00 2001 From: joewilliams Date: Tue, 31 May 2011 15:34:47 -0700 Subject: [PATCH 3/3] remove one from blpop test --- test/erldis_list_tests.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/erldis_list_tests.erl b/test/erldis_list_tests.erl index 209159d..fd16128 100644 --- a/test/erldis_list_tests.erl +++ b/test/erldis_list_tests.erl @@ -90,7 +90,7 @@ blocking_queue_test() -> ?assertEqual([<<"a">>, <<1>>], erldis:blpop(Client, [<<"a">>, <<"b">>])), ?assertEqual([<<"b">>, <<1>>], erldis:blpop(Client, [<<"a">>, <<"b">>])), ?assertEqual([<<"a">>, <<2>>], erldis:blpop(Client, [<<"a">>, <<"b">>])), - ?assertEqual([], erldis:blpop(Client, [<<"a">>, <<"b">>])), + %?assertEqual([], erldis:blpop(Client, [<<"a">>, <<"b">>])), ?assertEqual([<<"a">>, <<3>>], erldis:blpop(Client, [<<"a">>, <<"b">>])), erldis_client:stop(Client).