Merge pull request #518 from basho/zl/test-fix/fix-regression-yz_schema_admin-develop

fix regression yz schema admin... already merged into 2.0

Reviewed-by: cmeiklejohn

Author: borshop

include/yokozuna.hrl

@@ -130,7 +130,8 @@
 
 -define(DATA_DIR, application:get_env(riak_core, platform_data_dir)).
 
--define(DEFAULT_IDX_CREATE_TIMEOUT, 60000).
+%% Default timeout for index (put) creation.
+-define(DEFAULT_IDX_CREATE_TIMEOUT, 45000).
 
 -define(MAYBE(Check, Expression, Default),
         case Check of

riak_test/yz_schema_admin.erl

@@ -370,13 +370,7 @@ confirm_bad_schema(Cluster) ->
     lager:info("create ~s index using bad ~s schema", [Name, Name]),
     {ok, Status2, _, _} = http(put, URL2, Headers2, mochijson2:encode(Body)),
     %% This should return 204 because it simply adds an entry to the
-    %% ring.  The actual Solr Core creation is async.
-    ?assertEqual("204", Status2),
-
-    lager:info("give solr time to attempt to create core ~s", [Name]),
-    timer:sleep(5000),
-    lager:info("verify solr core ~s is not up", [Name]),
-    ?assertEqual(yz_solr:ping(Name), error),
+    ?assertEqual("400", Status2),
 
     lager:info("upload corrected schema ~s", [Name]),
     {ok, Status3, _, _} = http(put, URL, Headers, ?TEST_SCHEMA),
@@ -387,7 +381,12 @@ confirm_bad_schema(Cluster) ->
                 lager:info("try to ping core ~s", [Name]),
                 rpc:call(Node2, yz_solr, ping, [Name])
         end,
-    yz_rt:wait_until(Cluster, F).
+    yz_rt:wait_until(Cluster, F),
+
+    lager:info("create ~s index using good ~s schema", [Name, Name]),
+    {ok, Status4, _, _} = http(put, URL2, Headers2, mochijson2:encode(Body)),
+    %% This should return 204 because it simply adds an entry to the
+    ?assertEqual("204", Status4).
 
 %% @doc Confirm that creating a new shema gets added to the
 %%      cluster metadata as a compressed blob, and is retrievable