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 2019/08/19 00:56:11 UTC
[couchdb] branch master updated (ae62936 -> adc0315)
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
from ae62936 Extend timeouts for chttpd_view_test suite
new 08075fd Give resharding more time to complete
new 8b613bb Bump default timeout for retry_until
new 6927585 Extend timeout on shard splitting test
new adc0315 Refactor test to keep setup/teardown out of timer
The 4 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_split_tests.erl | 2 +-
src/ddoc_cache/test/eunit/ddoc_cache_lru_test.erl | 19 +++++++++++--------
test/elixir/lib/couch/db_test.ex | 2 +-
test/elixir/test/reshard_helpers.exs | 4 ++--
4 files changed, 15 insertions(+), 12 deletions(-)
[couchdb] 04/04: Refactor test to keep setup/teardown out of timer
Posted by ko...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit adc0315ecdb37a30ebb3eeaada70143ebe7dbd70
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Sun Aug 18 09:33:25 2019 -0400
Refactor test to keep setup/teardown out of timer
---
src/ddoc_cache/test/eunit/ddoc_cache_lru_test.erl | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/ddoc_cache/test/eunit/ddoc_cache_lru_test.erl b/src/ddoc_cache/test/eunit/ddoc_cache_lru_test.erl
index e37f1c0..9a53915 100644
--- a/src/ddoc_cache/test/eunit/ddoc_cache_lru_test.erl
+++ b/src/ddoc_cache/test/eunit/ddoc_cache_lru_test.erl
@@ -47,14 +47,17 @@ stop_couch(Ctx) ->
check_not_started_test() ->
% Starting couch, but not ddoc_cache
- Ctx = test_util:start_couch(),
- try
- Key = {ddoc_cache_entry_custom, {<<"dbname">>, ?MODULE}},
- ?assertEqual({ok, <<"dbname">>}, ddoc_cache_lru:open(Key))
- after
- test_util:stop_couch(Ctx)
- end.
-
+ {
+ setup,
+ fun test_util:start_couch/0,
+ fun test_util:stop_couch/1,
+ [
+ fun(_) ->
+ Key = {ddoc_cache_entry_custom, {<<"dbname">>, ?MODULE}},
+ ?assertEqual({ok, <<"dbname">>}, ddoc_cache_lru:open(Key))
+ end
+ ]
+ }.
check_lru_test_() ->
{
[couchdb] 02/04: Bump default timeout for retry_until
Posted by ko...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 8b613bbd7bfcf606f8344b519f68bf47f346a267
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Sat Aug 17 10:45:26 2019 -0400
Bump default timeout for retry_until
---
test/elixir/lib/couch/db_test.ex | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/elixir/lib/couch/db_test.ex b/test/elixir/lib/couch/db_test.ex
index 990173a..f98376c 100644
--- a/test/elixir/lib/couch/db_test.ex
+++ b/test/elixir/lib/couch/db_test.ex
@@ -290,7 +290,7 @@ defmodule Couch.DBTest do
end
end
- def retry_until(condition, sleep \\ 100, timeout \\ 5000) do
+ def retry_until(condition, sleep \\ 100, timeout \\ 30_000) do
retry_until(condition, now(:ms), sleep, timeout)
end
[couchdb] 03/04: Extend timeout on shard splitting test
Posted by ko...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 69275859c6a4840e127c5ba30e756a7640d5cfd5
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Sat Aug 17 19:03:32 2019 -0400
Extend timeout on shard splitting test
---
src/couch/test/eunit/couch_db_split_tests.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/couch/test/eunit/couch_db_split_tests.erl b/src/couch/test/eunit/couch_db_split_tests.erl
index c44f47c..312b5f8 100644
--- a/src/couch/test/eunit/couch_db_split_tests.erl
+++ b/src/couch/test/eunit/couch_db_split_tests.erl
@@ -155,7 +155,7 @@ should_copy_local_docs({Desc, TotalDocs, Q}, DbName) ->
TMap = make_targets(Ranges),
DocsPerRange = TotalDocs div Q,
PickFun = make_pickfun(DocsPerRange),
- {Desc, ?_test(begin
+ {Desc, timeout, ?TIMEOUT, ?_test(begin
{ok, UpdateSeq} = couch_db_split:split(DbName, TMap, PickFun),
?assertEqual(ExpectSeq, UpdateSeq),
Response = couch_db_split:copy_local_docs(DbName, TMap, PickFun),
[couchdb] 01/04: Give resharding more time to complete
Posted by ko...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 08075fd3f0e5477e892678874cfc2319b21de951
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Sat Aug 17 09:26:25 2019 -0400
Give resharding more time to complete
---
test/elixir/test/reshard_helpers.exs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/elixir/test/reshard_helpers.exs b/test/elixir/test/reshard_helpers.exs
index 52ce301..282d98c 100644
--- a/test/elixir/test/reshard_helpers.exs
+++ b/test/elixir/test/reshard_helpers.exs
@@ -92,7 +92,7 @@ defmodule ReshardHelpers do
end
def wait_job_removed(id) do
- retry_until(fn -> get_job(id).status_code == 404 end, 200, 10_000)
+ retry_until(fn -> get_job(id).status_code == 404 end, 200, 60_000)
end
def wait_job_completed(id) do
@@ -100,7 +100,7 @@ defmodule ReshardHelpers do
end
def wait_job_state(id, state) do
- retry_until(fn -> get_job_state(id) == state end, 200, 10_000)
+ retry_until(fn -> get_job_state(id) == state end, 200, 60_000)
end
def reset_reshard_state do