You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ko...@apache.org on 2020/01/28 20:47:25 UTC
[couchdb] branch 2493-remove-auth-cache updated (d2037b6 -> 03ea009)
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a change to branch 2493-remove-auth-cache
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
from d2037b6 Temporarily disable couch_auth_cache tests
new 7de1be8 More expunging of backdoor
new 03ea009 Try moving multi-part att tests to clustered port
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/couch/test/eunit/couch_db_mpr_tests.erl | 2 +-
src/couch/test/eunit/couchdb_mrview_cors_tests.erl | 14 ++------------
2 files changed, 3 insertions(+), 13 deletions(-)
[couchdb] 01/02: More expunging of backdoor
Posted by ko...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a commit to branch 2493-remove-auth-cache
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 7de1be8db014fdddac125f4ccc593310c2bdac63
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Tue Jan 28 15:37:29 2020 -0500
More expunging of backdoor
---
src/couch/test/eunit/couchdb_mrview_cors_tests.erl | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/couch/test/eunit/couchdb_mrview_cors_tests.erl b/src/couch/test/eunit/couchdb_mrview_cors_tests.erl
index 0f69048..3083586 100644
--- a/src/couch/test/eunit/couchdb_mrview_cors_tests.erl
+++ b/src/couch/test/eunit/couchdb_mrview_cors_tests.erl
@@ -70,8 +70,7 @@ show_tests() ->
{
"Check CORS for show",
[
- make_test_case(clustered, [fun should_make_shows_request/2]),
- make_test_case(backdoor, [fun should_make_shows_request/2])
+ make_test_case(clustered, [fun should_make_shows_request/2])
]
}.
@@ -92,16 +91,11 @@ should_make_shows_request(_, {Host, DbName}) ->
?assertEqual(<<"<h1>wosh</h1>">>, Body)
end).
-create_db(backdoor, DbName) ->
- {ok, Db} = couch_db:create(DbName, [?ADMIN_CTX]),
- couch_db:close(Db);
create_db(clustered, DbName) ->
{ok, Status, _, _} = test_request:put(db_url(DbName), [?AUTH], ""),
assert_success(create_db, Status),
ok.
-delete_db(backdoor, DbName) ->
- couch_server:delete(DbName, [?ADMIN_CTX]);
delete_db(clustered, DbName) ->
{ok, Status, _, _} = test_request:delete(db_url(DbName), [?AUTH]),
assert_success(delete_db, Status),
@@ -119,7 +113,6 @@ host_url(PortType) ->
bind_address(PortType) ->
config:get(section(PortType), "bind_address", "127.0.0.1").
-section(backdoor) -> "http";
section(clustered) -> "chttpd".
db_url(DbName) when is_binary(DbName) ->
@@ -128,10 +121,7 @@ db_url(DbName) when is_list(DbName) ->
host_url(clustered) ++ "/" ++ DbName.
port(clustered) ->
- integer_to_list(mochiweb_socket_server:get(chttpd, port));
-port(backdoor) ->
- integer_to_list(mochiweb_socket_server:get(couch_httpd, port)).
-
+ integer_to_list(mochiweb_socket_server:get(chttpd, port)).
upload_ddoc(Host, DbName) ->
Url = Host ++ "/" ++ DbName ++ "/_design/foo",
[couchdb] 02/02: Try moving multi-part att tests to clustered port
Posted by ko...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a commit to branch 2493-remove-auth-cache
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 03ea00930d93c37dda449e5f13e974b7d67534e7
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Tue Jan 28 15:47:14 2020 -0500
Try moving multi-part att tests to clustered port
---
src/couch/test/eunit/couch_db_mpr_tests.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/couch/test/eunit/couch_db_mpr_tests.erl b/src/couch/test/eunit/couch_db_mpr_tests.erl
index bb97c66..30ac983 100644
--- a/src/couch/test/eunit/couch_db_mpr_tests.erl
+++ b/src/couch/test/eunit/couch_db_mpr_tests.erl
@@ -32,7 +32,7 @@ setup() ->
ok = config:set("admins", ?USER, ?b2l(Hashed), _Persist=false),
TmpDb = ?tempdb(),
Addr = config:get("httpd", "bind_address", "127.0.0.1"),
- Port = mochiweb_socket_server:get(couch_httpd, port),
+ Port = mochiweb_socket_server:get(chttpd, port),
Url = lists:concat(["http://", Addr, ":", Port, "/", ?b2l(TmpDb)]),
Url.