You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2011/07/04 16:24:50 UTC
svn commit: r1142686 - /couchdb/trunk/test/etap/160-vhosts.t
Author: jan
Date: Mon Jul 4 14:24:50 2011
New Revision: 1142686
URL: http://svn.apache.org/viewvc?rev=1142686&view=rev
Log:
remove trailing spaces
Modified:
couchdb/trunk/test/etap/160-vhosts.t
Modified: couchdb/trunk/test/etap/160-vhosts.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/160-vhosts.t?rev=1142686&r1=1142685&r2=1142686&view=diff
==============================================================================
--- couchdb/trunk/test/etap/160-vhosts.t (original)
+++ couchdb/trunk/test/etap/160-vhosts.t Mon Jul 4 14:24:50 2011
@@ -101,20 +101,20 @@ test() ->
%% end boilerplate, start test
ok = couch_config:set("vhosts", "example.com", "/etap-test-db", false),
- ok = couch_config:set("vhosts", "*.example.com",
+ ok = couch_config:set("vhosts", "*.example.com",
"/etap-test-db/_design/doc1/_rewrite", false),
ok = couch_config:set("vhosts", "example.com/test", "/etap-test-db", false),
- ok = couch_config:set("vhosts", "example1.com",
+ ok = couch_config:set("vhosts", "example1.com",
"/etap-test-db/_design/doc1/_rewrite/", false),
ok = couch_config:set("vhosts",":appname.:dbname.example1.com",
"/:dbname/_design/:appname/_rewrite/", false),
ok = couch_config:set("vhosts", ":dbname.example1.com", "/:dbname", false),
-
+
ok = couch_config:set("vhosts", "*.example2.com", "/*", false),
ok = couch_config:set("vhosts", "*.example2.com/test", "/*", false),
- ok = couch_config:set("vhosts", "*/test", "/etap-test-db", false),
- ok = couch_config:set("vhosts", "*/test1",
- "/etap-test-db/_design/doc1/_show/test", false),
+ ok = couch_config:set("vhosts", "*/test", "/etap-test-db", false),
+ ok = couch_config:set("vhosts", "*/test1",
+ "/etap-test-db/_design/doc1/_show/test", false),
ok = couch_config:set("vhosts", "example3.com", "/", false),
%% reload rules
@@ -124,11 +124,11 @@ test() ->
test_vhost_request(),
test_vhost_request_with_qs(),
test_vhost_request_with_global(),
- test_vhost_requested_path(),
+ test_vhost_requested_path(),
test_vhost_requested_path_path(),
test_vhost_request_wildcard(),
test_vhost_request_replace_var(),
- test_vhost_request_replace_var1(),
+ test_vhost_request_replace_var1(),
test_vhost_request_replace_wildcard(),
test_vhost_request_path(),
test_vhost_request_path1(),
@@ -139,7 +139,7 @@ test() ->
%% restart boilerplate
couch_db:close(Db),
timer:sleep(3000),
- couch_server_sup:stop(),
+ couch_server_sup:stop(),
ok.
@@ -150,7 +150,7 @@ test_regular_request() ->
{<<"version">>,_}
]} = ejson:decode(Body),
etap:is(true, true, "should return server info");
- _Else ->
+ _Else ->
etap:is(false, true, <<"ibrowse fail">>)
end.
@@ -160,7 +160,7 @@ test_vhost_request() ->
{JsonBody} = ejson:decode(Body),
HasDbNameInfo = proplists:is_defined(<<"db_name">>, JsonBody),
etap:is(HasDbNameInfo, true, "should return database info");
- _Else ->
+ _Else ->
etap:is(false, true, <<"ibrowse fail">>)
end.
@@ -171,7 +171,7 @@ test_vhost_request_with_qs() ->
{JsonProps} = ejson:decode(Body),
HasRevsInfo = proplists:is_defined(<<"_revs_info">>, JsonProps),
etap:is(HasRevsInfo, true, "should return _revs_info");
- _Else ->
+ _Else ->
etap:is(false, true, <<"ibrowse fail">>)
end.
@@ -181,7 +181,7 @@ test_vhost_request_with_global() ->
{ok, _, _, Body2} ->
"<!DOCTYPE" ++ _Foo = Body2,
etap:is(true, true, "should serve /_utils even inside vhosts");
- _Else ->
+ _Else ->
etap:is(false, true, <<"ibrowse fail">>)
end.