[couchdb] branch feat/enable-compaction-daemon-by-default updated (85ab12b -> 3afe3ad)

[ja...@apache.org]

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

jan pushed a change to branch feat/enable-compaction-daemon-by-default
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


    omit 85ab12b  test: expect compaction daemon to be off
     new 3afe3ad  test: expect compaction daemon to be off

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   (85ab12b)
            \
             N -- N -- N   refs/heads/feat/enable-compaction-daemon-by-default (3afe3ad)

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:
 dev/run | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <co...@couchdb.apache.org>'].

[couchdb] 01/01: test: expect compaction daemon to be off

[ja...@apache.org]

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

jan pushed a commit to branch feat/enable-compaction-daemon-by-default
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 3afe3ad22b93c66db84df6739687cc5c693b24fd
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Fri Jun 30 11:08:57 2017 +0200

    test: expect compaction daemon to be off
---
 dev/run                                            | 3 ++-
 src/couch/test/couchdb_compaction_daemon_tests.erl | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dev/run b/dev/run
index 8af3ac4..36267ce 100755
--- a/dev/run
+++ b/dev/run
@@ -188,7 +188,8 @@ def setup_configs(ctx):
             "cluster_port": cluster_port,
             "backend_port": backend_port,
             "fauxton_root": fauxton_root,
-            "uuid": "fake_uuid_for_dev"
+            "uuid": "fake_uuid_for_dev",
+            "_default": ""
         }
         write_config(ctx, node, env)
 
diff --git a/src/couch/test/couchdb_compaction_daemon_tests.erl b/src/couch/test/couchdb_compaction_daemon_tests.erl
index fdb6654..908f1d3 100644
--- a/src/couch/test/couchdb_compaction_daemon_tests.erl
+++ b/src/couch/test/couchdb_compaction_daemon_tests.erl
@@ -23,8 +23,9 @@
 
 start() ->
     Ctx = test_util:start_couch(),
-    config:set("compaction_daemon", "check_interval", "3", false),
-    config:set("compaction_daemon", "min_file_size", "100000", false),
+    ok = config:set("compaction_daemon", "check_interval", "3", false),
+    ok = config:set("compaction_daemon", "min_file_size", "100000", false),
+    ok = config:delete("compactions", "_default", false),
     ok = meck:new(?MODS_TO_MOCK, [passthrough]),
     Ctx.
 

-- 
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.