Permalink
Browse files

Make sure we bind to any handoff port, since the default one might be…

… taken.
  • Loading branch information...
seancribbs committed Jul 17, 2012
1 parent 9a84189 commit c6091092373b6bb9b99b926c1b80bba7c46b9b92
Showing with 4 additions and 1 deletion.
  1. +1 −0 .travis.yml
  2. +3 −1 test/pb_service_test.erl
View
@@ -1,4 +1,5 @@
language: erlang
+script: (rebar compile && rebar eunit skip_deps=true) || (find . -name "*.log" -print -exec cat \{\} \; && sh -c "exit 1")
notifications:
webhooks: http://basho-engbot.herokuapp.com/travis?key=99ba84bc061813790957ee348953cfb45e413900
email: eng@basho.com
View
@@ -77,6 +77,8 @@ setup() ->
application:set_env(lager, handlers, [{lager_file_backend, [{"pb_service_test.log", debug, 10485760, "$D0", 5}]}]),
application:set_env(lager, error_logger_redirect, true),
+ application:set_env(riak_core, handoff_port, 0),
+
OldServices = riak_api_pb_service:dispatch_table(),
OldHost = app_helper:get_env(riak_api, pb_ip, "127.0.0.1"),
OldPort = app_helper:get_env(riak_api, pb_port, 8087),
@@ -214,7 +216,7 @@ dep_apps(App) ->
Apps.
all_deps(App) ->
- [ all_deps(Dep) || Dep <- dep_apps(App) ] ++ [App].
+ [[ all_deps(Dep) || Dep <- dep_apps(App) ],App].
resolve_deps(App) ->
DepList = lists:flatten(all_deps(App)),

0 comments on commit c609109

Please sign in to comment.