@@ -41,6 +41,8 @@ -export([start_link/0, start_link/3, register_temporary_exchange/4, register_temporary_exchange/5, register_exchange/4]). -export([unregister_exchange/3, dispatch/2, get_packetizer/1, raw_send/2, send_and_wait/2, send_and_wait/3, clear/1]). +-export([simulate_auth/1, ping/1]). + %% gen_server callbacks -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). @@ -53,6 +55,13 @@ start_link() -> start_link(Config, InspectorMod, InspectorPid) -> gen_server:start_link(?MODULE, [Config, InspectorMod, InspectorPid], []). +%% For unit testing only +simulate_auth(ServerPid) -> + gen_server:call(ServerPid, simulate_auth). + +ping(ServerPid) -> + gen_server:call(ServerPid, ping). + -spec(clear/1 :: (ServerPid :: pid()) -> 'ok'). clear(ServerPid) -> case gen_server:call(ServerPid, clear) of @@ -171,6 +180,12 @@ handle_call(_, {SenderPid, _}, State) when State#state.state =:= auth, (State#state.auth_pid =:= SenderPid) == false -> {reply, {wait, reconnecting}, State}; +handle_call(ping, _From, State) -> + {reply, pong, State}; + +handle_call(simulate_auth, _From, State) -> + {reply, ok, State#state{state=auth}}; + handle_call(clear, _From, _State) -> {reply, ok, #state{}}; src/natter_dispatcher.erl @@ -122,6 +122,14 @@ timeout_routing_test_() -> throw({error, timeout}) end end]}]. +blocking_auth_test_() -> + [{setup, fun start_dispatcher/0, + fun stop_dispatcher/1, + [fun() -> + pong = natter_dispatcher:ping(natterd), + natter_dispatcher:simulate_auth(natterd), + {wait, reconnecting} = natter_dispatcher:ping(natterd) end]}]. + start_dispatcher() -> {ok, Pid} = natter_dispatcher:start_link(), register(natterd, Pid), tests/test_natter_dispatcher.erl 683e582587ed9e4fe81976eb4fe1a847109076cd Kevin A. Smith ksmith@engineyard.com http://github.com/engineyard/natter/commit/8be07eb2e228ec1fd9f3ed2f0274412112f9265b 8be07eb2e228ec1fd9f3ed2f0274412112f9265b 2009-01-29T14:04:02-08:00 2009-01-29T14:04:02-08:00 * Added unit tests for new blocking auth behavior 69b3ce62e2a243e21d22c655e4927ba4bc62bb33 Kevin A. Smith ksmith@engineyard.com