From 549d98b258a9ba81210fcdebb718e08579a89e11 Mon Sep 17 00:00:00 2001
From: Andrei Zavada <azavada@contractor.basho.com>
Date: Fri, 15 Apr 2016 13:59:06 +0300
Subject: [PATCH] fix tuple-list-tuple conversion-related eunit tests once
 again

---
 src/riak_kv_qry.erl        | 12 ++++++------
 src/riak_kv_qry_worker.erl |  4 +---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/riak_kv_qry.erl b/src/riak_kv_qry.erl
index 1c8d655e6d..52bc67823f 100644
--- a/src/riak_kv_qry.erl
+++ b/src/riak_kv_qry.erl
@@ -298,12 +298,12 @@ describe_table_columns_test() ->
             " f, s, t))")),
     Res = do_describe(DDL),
     ?assertMatch(
-       {ok, [_, _,
-             [{<<"f">>, <<"varchar">>,   false, 1,  1},
-              {<<"s">>, <<"varchar">>,   false, 2,  2},
-              {<<"t">>, <<"timestamp">>, false, 3,  3},
-              {<<"w">>, <<"sint64">>, false, [], []},
-              {<<"p">>, <<"double">>, true,  [], []}]]},
+       {ok, {_, _,
+             [[<<"f">>, <<"varchar">>,   false, 1,  1],
+              [<<"s">>, <<"varchar">>,   false, 2,  2],
+              [<<"t">>, <<"timestamp">>, false, 3,  3],
+              [<<"w">>, <<"sint64">>, false, [], []],
+              [<<"p">>, <<"double">>, true,  [], []]]}},
        Res).
 
 validate_make_insert_row_basic_test() ->
diff --git a/src/riak_kv_qry_worker.erl b/src/riak_kv_qry_worker.erl
index 557dd1e901..d2c68ae319 100644
--- a/src/riak_kv_qry_worker.erl
+++ b/src/riak_kv_qry_worker.erl
@@ -292,10 +292,8 @@ prepare_final_results2(#riak_sel_clause_v1{col_return_types = ColTypes,
 
 prepare_final_results_test() ->
     Rows = [[12, <<"windy">>], [13, <<"windy">>]],
-    RowsAsTuples = [{12, <<"windy">>}, {13, <<"windy">>}],
-    % IndexedChunks = [{1, Rows}],
     ?assertEqual(
-        {[<<"a">>, <<"b">>], [sint64, varchar], RowsAsTuples},
+        {[<<"a">>, <<"b">>], [sint64, varchar], Rows},
         prepare_final_results(
             #state{
                 qry =