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/18 22:56:46 UTC
[couchdb] branch jenkins-elixir-retry-until-flakes updated (d0d53e5
-> 42efd5a)
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a change to branch jenkins-elixir-retry-until-flakes
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
discard d0d53e5 Refactor test to keep setup/teardown out of timer
discard 30b00be Extend timeout on shard splitting test
discard 0d481b9 Bump default timeout for retry_until
discard 7c25c75 Revert "Give async insert more time to complete"
discard 1708c9c Give async insert more time to complete
new e5a3ab0 Bump default timeout for retry_until
new 509e504 Extend timeout on shard splitting test
new 42efd5a Refactor test to keep setup/teardown out of timer
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d0d53e5)
\
N -- N -- N refs/heads/jenkins-elixir-retry-until-flakes (42efd5a)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 3 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:
[couchdb] 01/03: 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 jenkins-elixir-retry-until-flakes
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit e5a3ab0cfff34c19a95736896681fa27cfc57348
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] 02/03: 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 jenkins-elixir-retry-until-flakes
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 509e5048750556ecd4c9607fe423ae4cd61cce04
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] 03/03: 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 jenkins-elixir-retry-until-flakes
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 42efd5a10f2457756a31859d77db7fd9282271e0
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_() ->
{