Skip to content

Commit ac26c7d

Browse files
committed
fix relative paths
rebar3 runs tests from the project root
1 parent 93767a1 commit ac26c7d

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

apps/riak/test/riak_schema_test.erl

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22
-include_lib("eunit/include/eunit.hrl").
33
-compile(export_all).
44

5+
-define(riak_schema, "rel/files/riak.schema").
6+
-define(eleveldb_schema, "_build/test/lib/eleveldb/priv/eleveldb.schema").
7+
58
basic_schema_test() ->
69
Config = cuttlefish_unit:generate_templated_config(
7-
["../../../rel/files/riak.schema"], [], context(), predefined_schema()),
10+
[?riak_schema], [], context(), predefined_schema()),
811

912
cuttlefish_unit:assert_config(Config, "lager.handlers",
1013
[
@@ -47,7 +50,7 @@ override_schema_test() ->
4750
{["distributed_cookie"], "tyktorp"}],
4851

4952
Config = cuttlefish_unit:generate_templated_config(
50-
["../../../rel/files/riak.schema"], Conf, context(), predefined_schema()),
53+
[?riak_schema], Conf, context(), predefined_schema()),
5154

5255
cuttlefish_unit:assert_config(Config, "lager.handlers",
5356
[{lager_syslog_backend, ["riak", daemon, info]},
@@ -80,7 +83,7 @@ custom_syslog_test() ->
8083
{["log","syslog","facility"], local4},
8184
{["log","syslog","level"], warning}],
8285
Config = cuttlefish_unit:generate_templated_config(
83-
["../../../rel/files/riak.schema"], Conf, context(), predefined_schema()),
86+
[?riak_schema], Conf, context(), predefined_schema()),
8487
cuttlefish_unit:assert_config(Config, "lager.handlers",
8588
[{lager_syslog_backend, ["VeryCool", local4, warning]},
8689
{lager_file_backend, [{file, "./log/console.log"},
@@ -99,22 +102,22 @@ custom_syslog_test() ->
99102
crash_log_test() ->
100103
Conf = [{["log", "crash"], off}],
101104
Config = cuttlefish_unit:generate_templated_config(
102-
["../../../rel/files/riak.schema"], Conf, context(), predefined_schema()),
105+
[?riak_schema], Conf, context(), predefined_schema()),
103106
cuttlefish_unit:assert_config(Config, "lager.crash_log", undefined),
104107
ok.
105108

106109
devrel_test() ->
107110
RelConfig = cuttlefish_unit:generate_templated_config(
108-
["../../../rel/files/riak.schema",
109-
"../../../deps/eleveldb/priv/eleveldb.schema"],
111+
[?riak_schema,
112+
?eleveldb_schema],
110113
[], context(), predefined_schema()),
111114

112115
cuttlefish_unit:assert_config(RelConfig, "eleveldb.limited_developer_mem", false),
113116
cuttlefish_unit:assert_not_configured(RelConfig, "vm_args.-shutdown_time"),
114117

115118
DevRelConfig = cuttlefish_unit:generate_templated_config(
116-
["../../../rel/files/riak.schema",
117-
"../../../deps/eleveldb/priv/eleveldb.schema"], [],
119+
[?riak_schema,
120+
?eleveldb_schema], [],
118121
lists:keyreplace(devrel, 1, context(), {devrel, true}), predefined_schema()),
119122

120123
cuttlefish_unit:assert_config(DevRelConfig, "eleveldb.limited_developer_mem", true),

0 commit comments

Comments
 (0)