Permalink
Browse files

Update test_jsonrpc_inets to run with Erlang/OTP R14B03.

  • Loading branch information...
1 parent d2725fc commit fd467939c4fef5233f4e60161775f63be5614fe2 @tonyg committed Oct 17, 2011
Showing with 9 additions and 3 deletions.
  1. +1 −1 .gitignore
  2. +2 −0 test/server_root/logs/README
  3. +6 −2 test/test_jsonrpc_inets.erl
View
@@ -1,5 +1,5 @@
*.beam
-test/server_root/logs/
+test/server_root/logs/*_log
build
dist
doc
@@ -0,0 +1,2 @@
+Directory in which the test_jsonrpc_inets inets httpd instance will
+place its log files.
@@ -46,8 +46,12 @@ start() ->
type = <<"str">>}]}])).
start_httpd() ->
- rfc4627_jsonrpc:start(),
- httpd:start("test/server_root/conf/httpd.conf"),
+ ok = case rfc4627_jsonrpc:start() of
+ {ok, _JsonrpcPid} -> ok;
+ {error, {already_started, _JsonrpcPid}} -> ok
+ end,
+ ok = inets:start(),
+ {ok, _HttpdPid} = inets:start(httpd, [{file, "test/server_root/conf/httpd.conf"}]),
start().
%---------------------------------------------------------------------------

0 comments on commit fd46793

Please sign in to comment.