You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ji...@apache.org on 2020/01/10 11:54:13 UTC
[couchdb] branch bloodbuild-afterxmas4 updated (b42fc4b -> 596e529)
This is an automated email from the ASF dual-hosted git repository.
jiangphcn pushed a change to branch bloodbuild-afterxmas4
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
discard b42fc4b address smoosh failure
discard 15324a3 disable smoosh test
discard 35b9ee7 disable test
discard 9d52886 disable test
add fe12bd8 Fix chttpd_purge_tests.erl
add 628e757 Address flaky test failure on t_invalid_view/1
add 9fd9d15 Fix missing parentheses in couchdb.in
add 8dd8988 Add a JUnit report to JavaScript tests
add b66f6b4 Include JavaScript test results in report
add 129183b Generate test results on build failures
add 91654ae Include test reports when uploading logs
add 2f9501a Prevent the elision of `jenkins` in log URLs
add 275e10c Include JavaScript JUnit reports in Jenkins
add e23f3ef Use separate requests to write design when replicating
add 508d149 Remove EUnit retries on failure
new 596e529 disable test
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 (b42fc4b)
\
N -- N -- N refs/heads/bloodbuild-afterxmas4 (596e529)
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:
.gitignore | 1 +
Makefile | 17 ++---
build-aux/Jenkinsfile.full | 24 +++----
build-aux/Jenkinsfile.pr | 4 +-
build-aux/logfile-uploader.py | 5 +-
build-aux/show-test-results.py | 3 +-
rel/files/couchdb.in | 4 +-
src/chttpd/test/eunit/chttpd_purge_tests.erl | 3 +-
.../src/couch_replicator_worker.erl | 26 +++++---
.../eunit/couch_replicator_many_leaves_tests.erl | 9 +--
test/javascript/run | 76 ++++++++++++++++++++--
11 files changed, 127 insertions(+), 45 deletions(-)
[couchdb] 01/01: disable test
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jiangphcn pushed a commit to branch bloodbuild-afterxmas4
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 596e5298b5e4c30c447adadfb6a60bba9082e4e4
Author: jiangph <ji...@cn.ibm.com>
AuthorDate: Tue Jan 7 10:24:38 2020 +0800
disable test
---
.../test/eunit/couch_replicator_retain_stats_between_job_runs.erl | 2 +-
src/ddoc_cache/test/eunit/ddoc_cache_lru_test.erl | 2 +-
src/smoosh/src/smoosh_server.erl | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/couch_replicator/test/eunit/couch_replicator_retain_stats_between_job_runs.erl b/src/couch_replicator/test/eunit/couch_replicator_retain_stats_between_job_runs.erl
index 9dd86b3..8f80a40 100644
--- a/src/couch_replicator/test/eunit/couch_replicator_retain_stats_between_job_runs.erl
+++ b/src/couch_replicator/test/eunit/couch_replicator_retain_stats_between_job_runs.erl
@@ -36,7 +36,7 @@ teardown({Ctx, {Source, Target}}) ->
ok = test_util:stop_couch(Ctx).
-stats_retained_test_() ->
+stats_retained_test() ->
{
setup,
fun setup/0,
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 9a53915..2f71acc 100644
--- a/src/ddoc_cache/test/eunit/ddoc_cache_lru_test.erl
+++ b/src/ddoc_cache/test/eunit/ddoc_cache_lru_test.erl
@@ -68,7 +68,7 @@ check_lru_test_() ->
{"check_multi_start", fun check_multi_start/1},
{"check_multi_open", fun check_multi_open/1},
{"check_capped_size", fun check_capped_size/1},
- {"check_cache_refill", fun check_cache_refill/1},
+ %{"check_cache_refill", fun check_cache_refill/1},
{"check_evict_and_exit", fun check_evict_and_exit/1}
])
}.
diff --git a/src/smoosh/src/smoosh_server.erl b/src/smoosh/src/smoosh_server.erl
index f9c5210..2da327d 100644
--- a/src/smoosh/src/smoosh_server.erl
+++ b/src/smoosh/src/smoosh_server.erl
@@ -15,6 +15,7 @@
-vsn(4).
-behaviour(config_listener).
-include_lib("couch/include/couch_db.hrl").
+-include_lib("couch/include/couch_eunit.hrl").
% public api.
-export([
@@ -326,6 +327,7 @@ get_priority(Channel, {Shard, GroupId}) ->
{not_found, _Reason} ->
0;
{error, Reason} ->
+ ?debugMsg("Error in get_priority"),
couch_log:warning("Failed to get group_pid for ~p ~p ~p: ~p",
[Channel, Shard, GroupId, Reason]),
0