[couchdb] branch 5986-tests-only created (now 32e0a13)

[rn...@apache.org]

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

rnewson pushed a change to branch 5986-tests-only
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


      at 32e0a13  Enable port 5986 for test suites only

This branch includes the following new commits:

     new 32e0a13  Enable port 5986 for test suites only

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.

[couchdb] 01/01: Enable port 5986 for test suites only

[rn...@apache.org]

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

rnewson pushed a commit to branch 5986-tests-only
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 32e0a1328aed634c46ef2baa6962b2f15337457a
Author: Robert Newson <bo...@rsn.io>
AuthorDate: Thu Dec 12 22:54:49 2019 +0000

    Enable port 5986 for test suites only
---
 dev/run                   | 7 +++++++
 rel/files/eunit.ini       | 1 +
 rel/overlay/etc/local.ini | 1 -
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/dev/run b/dev/run
index 9209c11..edda5fd 100755
--- a/dev/run
+++ b/dev/run
@@ -400,6 +400,13 @@ def boot_haproxy(ctx):
 
 def hack_default_ini(ctx, node, contents):
 
+    contents = re.sub(
+            "^\[httpd\]$",
+            "[httpd]\nenable = true",
+            contents,
+            flags=re.MULTILINE,
+        )
+
     if ctx["enable_erlang_views"]:
         contents = re.sub(
             "^\[native_query_servers\]$",
diff --git a/rel/files/eunit.ini b/rel/files/eunit.ini
index 2536a6a..361ea66 100644
--- a/rel/files/eunit.ini
+++ b/rel/files/eunit.ini
@@ -21,6 +21,7 @@ uuid = 74696d6520746f2072656c617821
 default_security = everyone
 
 [httpd]
+enable = true
 port = 0
 
 [chttpd]
diff --git a/rel/overlay/etc/local.ini b/rel/overlay/etc/local.ini
index 5ccc826..2c9e899 100644
--- a/rel/overlay/etc/local.ini
+++ b/rel/overlay/etc/local.ini
@@ -30,7 +30,6 @@
 ;socket_options = [{sndbuf, 262144}, {nodelay, true}]
 
 [httpd]
-enable = true ; for the test suites
 ; NOTE that this only configures the "backend" node-local port, not the
 ; "frontend" clustered port. You probably don't want to change anything in
 ; this section.