diff options
| author | Filipe David Borba Manana <fdmanana@apache.org> | 2011-09-29 23:34:40 +0000 |
|---|---|---|
| committer | Filipe David Borba Manana <fdmanana@apache.org> | 2011-09-29 23:34:40 +0000 |
| commit | 1285cd95c8fe351991218f886bbfe28d9a9a3b09 (patch) | |
| tree | a62af53acc1fb9be4e943ab1935e6fa92889863f /test/etap/200-view-group-no-db-leaks.t | |
| parent | 89a5c28775f24f2706f443c76afa3edf9df78ce4 (diff) | |
Remove usage of http module from etap tests
This module is deprecated in OTP R15, which is going to
be released by the end of this year.
The etap tests now use ibrowse instead.
This is a backport of revision 1177459 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1177463 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test/etap/200-view-group-no-db-leaks.t')
| -rwxr-xr-x | test/etap/200-view-group-no-db-leaks.t | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/test/etap/200-view-group-no-db-leaks.t b/test/etap/200-view-group-no-db-leaks.t index f506b7dc..6c076674 100755 --- a/test/etap/200-view-group-no-db-leaks.t +++ b/test/etap/200-view-group-no-db-leaks.t @@ -19,21 +19,6 @@ handler }). --define(LATEST_DISK_VERSION, 5). - --record(db_header, - {disk_version = ?LATEST_DISK_VERSION, - update_seq = 0, - unused = 0, - fulldocinfo_by_id_btree_state = nil, - docinfo_by_seq_btree_state = nil, - local_docs_btree_state = nil, - purge_seq = 0, - purged_docs = nil, - security_ptr = nil, - revs_limit = 1000 -}). - -record(db, { main_pid = nil, update_pid = nil, @@ -41,7 +26,7 @@ instance_start_time, % number of microsecs since jan 1 1970 as a binary string fd, fd_ref_counter, - header = #db_header{}, + header = nil, committed_update_seq, fulldocinfo_by_id_btree, docinfo_by_seq_btree, @@ -80,7 +65,6 @@ test() -> timer:sleep(1000), put(addr, couch_config:get("httpd", "bind_address", "127.0.0.1")), put(port, integer_to_list(mochiweb_socket_server:get(couch_httpd, port))), - application:start(inets), delete_db(), create_db(), @@ -171,11 +155,10 @@ compact_view_group() -> wait_view_compact_done(0) -> etap:bail("View group compaction failed to finish."); wait_view_compact_done(N) -> - {ok, {{_, Code, _}, _Headers, Body}} = http:request( - get, - {db_url() ++ "/_design/" ++ binary_to_list(ddoc_name()) ++ "/_info", []}, + {ok, Code, _Headers, Body} = test_util:request( + db_url() ++ "/_design/" ++ binary_to_list(ddoc_name()) ++ "/_info", [], - [{sync, true}]), + get), case Code of 200 -> ok; _ -> etap:bail("Invalid view group info.") @@ -252,11 +235,9 @@ db_url() -> binary_to_list(test_db_name()). query_view() -> - {ok, {{_, Code, _}, _Headers, _Body}} = http:request( - get, - {db_url() ++ "/_design/" ++ binary_to_list(ddoc_name()) ++ - "/_view/bar", []}, + {ok, Code, _Headers, _Body} = test_util:request( + db_url() ++ "/_design/" ++ binary_to_list(ddoc_name()) ++ "/_view/bar", [], - [{sync, true}]), + get), etap:is(Code, 200, "got view response"), ok. |