summaryrefslogtreecommitdiff
path: root/test/etap
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2011-04-25 23:46:12 +0000
committerJan Lehnardt <jan@apache.org>2011-04-25 23:46:12 +0000
commit0e0e8d3375cb4b7ebb1edd25ac9302f6e22e2b93 (patch)
treef6cff5dbed0b7eb15ea9e5aa5040d078148d9787 /test/etap
parentb9c5282ea2220e09332c70ad5fbeae4b3be75b76 (diff)
Fix vhosts for https and fix vhost dependence on sorting of
values in the config system which isn't guaranteed. Make vhost test cases more robust. Closes COUCHDB-1103 Source patch by Benoit and tests patch by me. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1096636 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test/etap')
-rwxr-xr-xtest/etap/160-vhosts.t30
1 files changed, 15 insertions, 15 deletions
diff --git a/test/etap/160-vhosts.t b/test/etap/160-vhosts.t
index c7dc8f99..8dac53e5 100755
--- a/test/etap/160-vhosts.t
+++ b/test/etap/160-vhosts.t
@@ -155,9 +155,9 @@ test_regular_request() ->
test_vhost_request() ->
case ibrowse:send_req(server(), [], get, [], [{host_header, "example.com"}]) of
{ok, _, _, Body} ->
- {[{<<"db_name">>, <<"etap-test-db">>},_,_,_,_,_,_,_,_,_]}
- = couch_util:json_decode(Body),
- etap:is(true, true, "should return database info");
+ {JsonBody} = couch_util:json_decode(Body),
+ HasDbNameInfo = proplists:is_defined(<<"db_name">>, JsonBody),
+ etap:is(HasDbNameInfo, true, "should return database info");
_Else ->
etap:is(false, true, <<"ibrowse fail">>)
end.
@@ -222,9 +222,9 @@ test_vhost_request_wildcard()->
test_vhost_request_replace_var() ->
case ibrowse:send_req(server(), [], get, [], [{host_header,"etap-test-db.example1.com"}]) of
{ok, _, _, Body} ->
- {[{<<"db_name">>, <<"etap-test-db">>},_,_,_,_,_,_,_,_,_]}
- = couch_util:json_decode(Body),
- etap:is(true, true, "should return database info");
+ {JsonBody} = couch_util:json_decode(Body),
+ HasDbNameInfo = proplists:is_defined(<<"db_name">>, JsonBody),
+ etap:is(HasDbNameInfo, true, "should return database info");
_Else -> etap:is(false, true, <<"ibrowse fail">>)
end.
@@ -242,9 +242,9 @@ test_vhost_request_replace_var1() ->
test_vhost_request_replace_wildcard() ->
case ibrowse:send_req(server(), [], get, [], [{host_header,"etap-test-db.example2.com"}]) of
{ok, _, _, Body} ->
- {[{<<"db_name">>, <<"etap-test-db">>},_,_,_,_,_,_,_,_,_]}
- = couch_util:json_decode(Body),
- etap:is(true, true, "should return database info");
+ {JsonBody} = couch_util:json_decode(Body),
+ HasDbNameInfo = proplists:is_defined(<<"db_name">>, JsonBody),
+ etap:is(HasDbNameInfo, true, "should return database info");
_Else -> etap:is(false, true, <<"ibrowse fail">>)
end.
@@ -252,9 +252,9 @@ test_vhost_request_path() ->
Uri = server() ++ "test",
case ibrowse:send_req(Uri, [], get, [], [{host_header, "example.com"}]) of
{ok, _, _, Body} ->
- {[{<<"db_name">>, <<"etap-test-db">>},_,_,_,_,_,_,_,_,_]}
- = couch_util:json_decode(Body),
- etap:is(true, true, "should return database info");
+ {JsonBody} = couch_util:json_decode(Body),
+ HasDbNameInfo = proplists:is_defined(<<"db_name">>, JsonBody),
+ etap:is(HasDbNameInfo, true, "should return database info");
_Else -> etap:is(false, true, <<"ibrowse fail">>)
end.
@@ -272,9 +272,9 @@ test_vhost_request_path2() ->
Uri = server() ++ "test",
case ibrowse:send_req(Uri, [], get, [], [{host_header,"etap-test-db.example2.com"}]) of
{ok, _, _, Body} ->
- {[{<<"db_name">>, <<"etap-test-db">>},_,_,_,_,_,_,_,_,_]}
- = couch_util:json_decode(Body),
- etap:is(true, true, "should return database info");
+ {JsonBody} = couch_util:json_decode(Body),
+ HasDbNameInfo = proplists:is_defined(<<"db_name">>, JsonBody),
+ etap:is(HasDbNameInfo, true, "should return database info");
_Else -> etap:is(false, true, <<"ibrowse fail">>)
end.