diff options
| author | Damien F. Katz <damien@apache.org> | 2010-04-02 23:17:02 +0000 |
|---|---|---|
| committer | Damien F. Katz <damien@apache.org> | 2010-04-02 23:17:02 +0000 |
| commit | 8897dbe40941295009d156bf77eb0bf40abc5136 (patch) | |
| tree | 46c2d859e2baa93190f4c8757f8ffa880de2f07f /src | |
| parent | 776b36073865dc66a7834beabf3074b32d9669a1 (diff) | |
Removed _sleep from all tests. replaced with loops that spin until a condition is true. Makes tests faster and less likely to fail sporadically.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@930430 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
| -rw-r--r-- | src/couchdb/couch_httpd_misc_handlers.erl | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/couchdb/couch_httpd_misc_handlers.erl b/src/couchdb/couch_httpd_misc_handlers.erl index d58dfacd..70a28b48 100644 --- a/src/couchdb/couch_httpd_misc_handlers.erl +++ b/src/couchdb/couch_httpd_misc_handlers.erl @@ -15,7 +15,7 @@ -export([handle_welcome_req/2,handle_favicon_req/2,handle_utils_dir_req/2, handle_all_dbs_req/1,handle_replicate_req/1,handle_restart_req/1, handle_uuids_req/1,handle_config_req/1,handle_log_req/1, - handle_task_status_req/1,handle_sleep_req/1]). + handle_task_status_req/1]). -export([increment_update_seq_req/2]). @@ -64,13 +64,6 @@ handle_utils_dir_req(#httpd{method='GET'}=Req, DocumentRoot) -> handle_utils_dir_req(Req, _) -> send_method_not_allowed(Req, "GET,HEAD"). -handle_sleep_req(#httpd{method='GET'}=Req) -> - Time = list_to_integer(couch_httpd:qs_value(Req, "time")), - receive snicklefart -> ok after Time -> ok end, - send_json(Req, {[{ok, true}]}); -handle_sleep_req(Req) -> - send_method_not_allowed(Req, "GET,HEAD"). - handle_all_dbs_req(#httpd{method='GET'}=Req) -> {ok, DbNames} = couch_server:all_databases(), send_json(Req, DbNames); |