Correctly find schema for rabbit application named "rabbitmq.schema"

Author: lukebakken

src/rabbit_ct_config_schema.erl

@@ -23,10 +23,14 @@
 init_schemas(App, Config) ->
     DepsDir = ?config(erlang_mk_depsdir, Config),
     % Note: the schema for the rabbit app is named "rabbitmq.schema"
-    RabbitSchema = filename:join([DepsDir, "rabbit", "priv", "schema", "rabbitmq.schema"]),
+    RabbitSchemaInfo = {DepsDir, rabbit, "rabbitmq.schema"},
+    RabbitSchema = find_app_schema(RabbitSchemaInfo),
     Schemas = case App of
         rabbit -> [RabbitSchema];
-        _      -> [RabbitSchema, find_app_schema(App, DepsDir)]
+        _ ->
+            SchemaFileName = atom_to_list(App) ++ ".schema",
+            SchemaInfo = {DepsDir, App, SchemaFileName},
+            [RabbitSchema, find_app_schema(SchemaInfo)]
     end,
     ct:pal("Schemas ~p~n", [Schemas]),
     SchemaDir = filename:join(?config(data_dir, Config), "schema"),
@@ -45,21 +49,21 @@ 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).
+find_app_schema({DepsDir, App, SchemaFileName}=Info) ->
+    SchemaFile = get_schema_for([DepsDir, App], SchemaFileName),
+    does_schema_exist(filelib:is_regular(SchemaFile), Info, SchemaFile, cont).
 
-does_schema_exist(true, _App, _DepsDir, Schema, _) ->
-    Schema;
-does_schema_exist(false, App, _DepsDir, _Schema, stop) ->
+does_schema_exist(true, _Info, SchemaFile, _) ->
+    SchemaFile;
+does_schema_exist(false, {_, App, _}, _SchemaFile, stop) ->
     ct:fail("Could not find schema for app: ~p~n", [App]);
-does_schema_exist(false, App, DepsDir, _Schema, cont) ->
+does_schema_exist(false, {DepsDir, _, SchemaFileName}=Info, _SchemaFile, 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).
+    SchemaFile = get_schema_for([DepsDir, ".."], SchemaFileName),
+    does_schema_exist(filelib:is_regular(SchemaFile), Info, SchemaFile, stop).
 
-get_schema_for(Prefix, App) ->
-    filename:join(Prefix ++ ["schema", atom_to_list(App) ++ ".schema"]).
+get_schema_for(Prefix, SchemaFileName) ->
+    filename:join(Prefix ++ ["priv", "schema", SchemaFileName]).
 
 copy_to(File, Dir) ->
     BaseName = filename:basename(File),