[couchdb] branch more-couch-jobs-flakiness updated (54673a9 -> 57ff0da)

[va...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a change to branch more-couch-jobs-flakiness
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


 discard 54673a9  Fix more couch_jobs flakiness
     new 57ff0da  Fix more couch_jobs flakiness

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   (54673a9)
            \
             N -- N -- N   refs/heads/more-couch-jobs-flakiness (57ff0da)

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 1 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_jobs/test/couch_jobs_tests.erl | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

[couchdb] 01/01: Fix more couch_jobs flakiness

[va...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a commit to branch more-couch-jobs-flakiness
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 57ff0dafc633bbf8a4d8bfd1588f70553696c862
Author: Nick Vatamaniuc <va...@apache.org>
AuthorDate: Fri Mar 12 16:12:05 2021 -0500

    Fix more couch_jobs flakiness
    
    The errors see in #3417 seem to indicate the expiration jobs are interfering
    with the couch_jobs tests, to prevent that prevent expiration_db job gen_server
    from starting at all.
    
    Fixes #3417
---
 src/couch_jobs/test/couch_jobs_tests.erl | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/couch_jobs/test/couch_jobs_tests.erl b/src/couch_jobs/test/couch_jobs_tests.erl
index b40e52e..3582c64 100644
--- a/src/couch_jobs/test/couch_jobs_tests.erl
+++ b/src/couch_jobs/test/couch_jobs_tests.erl
@@ -78,10 +78,21 @@ couch_jobs_basic_test_() ->
 
 
 setup_couch() ->
+    % Because of a circular dependency between `couch_jobs` and `fabric` in
+    % `fabric2_db_expiration` module, disable db expiration so when
+    % `couch_jobs` is stopped the test, `fabric` app doesn't get torn down as
+    % well and we don't see spurious <<"db_expiration">> jobs show up in test
+    % results.
+    meck:new(fabric2_db_expiration, [passthrough]),
+    meck:expect(fabric2_db_expiration, handle_info, fun
+        (timeout, St) -> {noreply, St};
+        (Msg, St) -> meck:passthrough([Msg, St])
+    end),
     test_util:start_couch([fabric]).
 
 
 teardown_couch(Ctx) ->
+    meck:unload(),
     test_util:stop_couch(Ctx).