Merge pull request #9 from rabbitmq/rabbitmq-ct-helpers-8

Find app schema either in deps/App/priv or priv/

Author: hairyhum

src/rabbit_ct_config_schema.erl

@@ -25,8 +25,7 @@ init_schemas(App, Config) ->
     RabbitSchema = filename:join([DepsDir, "rabbit", "priv", "schema", "rabbitmq.schema"]),
     Schemas = case App of
         rabbit -> [RabbitSchema];
-        _      -> [RabbitSchema,
-                   filename:join([DepsDir, App, "priv", "schema", atom_to_list(App) ++ ".schema"])]
+        _      -> [RabbitSchema, find_app_schema(App, DepsDir)]
     end,
     ct:pal("Schemas ~p~n", [Schemas]),
     SchemaDir = filename:join(?config(data_dir, Config), "schema"),
@@ -45,6 +44,22 @@ init_schemas(App, Config) ->
         {conf_snippets, Snippets}
         ]).
 
+find_app_schema(App, DepsDir) ->
+    Schema = get_schema_for([DepsDir, App, "priv"], App),
+    does_schema_exist(filelib:is_regular(Schema), App, DepsDir, Schema, cont).
+
+does_schema_exist(true, _App, _DepsDir, Schema, _) ->
+    Schema;
+does_schema_exist(false, App, _DepsDir, _Schema, stop) ->
+    ct:fail("Could not find schema for app: ~p~n", [App]);
+does_schema_exist(false, App, DepsDir, _Schema, cont) ->
+    % If not in umbrella, priv will be at ../priv
+    Schema = get_schema_for([DepsDir, "..", "priv"], App),
+    does_schema_exist(filelib:is_regular(Schema), App, DepsDir, Schema, stop).
+
+get_schema_for(Prefix, App) ->
+    filename:join(Prefix ++ ["schema", atom_to_list(App) ++ ".schema"]).
+
 copy_to(File, Dir) ->
     BaseName = filename:basename(File),
     {ok, _} = file:copy(File, Dir ++ "/" ++ BaseName).

src/rabbit_ct_helpers.erl

@@ -166,7 +166,7 @@ ensure_erlang_mk_depsdir(Config) ->
         true  -> set_config(Config, {erlang_mk_depsdir, Path});
         false -> {skip,
                   "deps directory required, " ++
-                  "please set DEPSD_DIR or 'erlang_mk_depsdir' " ++
+                  "please set DEPS_DIR or 'erlang_mk_depsdir' " ++
                   "in ct config"}
     end.