Changes to support renaming rabbitmq.schema to rabbit.schema

Author: lukebakken

src/rabbit_ct_config_schema.erl

@@ -22,15 +22,10 @@
 
 init_schemas(App, Config) ->
     DepsDir = ?config(erlang_mk_depsdir, Config),
-    % Note: the schema for the rabbit app is named "rabbitmq.schema"
-    RabbitSchemaInfo = {DepsDir, rabbit, "rabbitmq.schema"},
-    RabbitSchema = find_app_schema(RabbitSchemaInfo),
+    RabbitSchema = find_app_schema(rabbit, DepsDir),
     Schemas = case App of
         rabbit -> [RabbitSchema];
-        _ ->
-            SchemaFileName = atom_to_list(App) ++ ".schema",
-            SchemaInfo = {DepsDir, App, SchemaFileName},
-            [RabbitSchema, find_app_schema(SchemaInfo)]
+        _      -> [RabbitSchema, find_app_schema(App, DepsDir)]
     end,
     ct:pal("Schemas ~p~n", [Schemas]),
     SchemaDir = filename:join(?config(data_dir, Config), "schema"),
@@ -49,20 +44,21 @@ init_schemas(App, Config) ->
         {conf_snippets, Snippets}
         ]).
 
-find_app_schema({DepsDir, App, SchemaFileName}=Info) ->
-    SchemaFile = get_schema_for([DepsDir, App], SchemaFileName),
-    does_schema_exist(filelib:is_regular(SchemaFile), Info, SchemaFile, cont).
+find_app_schema(App, DepsDir) ->
+    SchemaFile = get_schema_for([DepsDir, App], App),
+    does_schema_exist(filelib:is_regular(SchemaFile), App, DepsDir, SchemaFile, cont).
 
-does_schema_exist(true, _Info, SchemaFile, _) ->
+does_schema_exist(true, _App, _DepsDir, SchemaFile, _) ->
     SchemaFile;
-does_schema_exist(false, {_, App, _}, _SchemaFile, stop) ->
+does_schema_exist(false, App, _DepsDir, _SchemaFile, stop) ->
     ct:fail("Could not find schema for app: ~p~n", [App]);
-does_schema_exist(false, {DepsDir, _, SchemaFileName}=Info, _SchemaFile, cont) ->
+does_schema_exist(false, App, DepsDir, _SchemaFile, cont) ->
     % If not in umbrella, priv will be at ../priv
-    SchemaFile = get_schema_for([DepsDir, ".."], SchemaFileName),
-    does_schema_exist(filelib:is_regular(SchemaFile), Info, SchemaFile, stop).
+    SchemaFile = get_schema_for([DepsDir, ".."], App),
+    does_schema_exist(filelib:is_regular(SchemaFile), App, DepsDir, SchemaFile, stop).
 
-get_schema_for(Prefix, SchemaFileName) ->
+get_schema_for(Prefix, App) ->
+    SchemaFileName = atom_to_list(App) ++ ".schema",
     filename:join(Prefix ++ ["priv", "schema", SchemaFileName]).
 
 copy_to(File, Dir) ->