This is an automated email from the ASF dual-hosted git repository. rnewson pushed a commit to branch nouveau-test-config in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit f6f0185592745ac3720835e73a0b7e39e809f8f0 Author: Robert Newson <[email protected]> AuthorDate: Mon Dec 18 15:46:27 2023 +0000 align nouveau test config with package --- dev/run | 2 +- nouveau/{ => src/test/resources}/nouveau.yaml | 12 ++++++------ src/nouveau/src/nouveau_util.erl | 2 +- test/elixir/test/nouveau_test.exs | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dev/run b/dev/run index 8d47d76f9..f4b689929 100755 --- a/dev/run +++ b/dev/run @@ -516,7 +516,7 @@ def boot_nouveau(ctx): "./gradlew", "run", "--args", - "server nouveau.yaml", + "server src/test/resources/nouveau.yaml", ] logfname = os.path.join(ctx["devdir"], "logs", "nouveau.log") log = open(logfname, "w") diff --git a/nouveau/nouveau.yaml b/nouveau/src/test/resources/nouveau.yaml similarity index 71% rename from nouveau/nouveau.yaml rename to nouveau/src/test/resources/nouveau.yaml index 095b06bcf..7ff3c4377 100644 --- a/nouveau/nouveau.yaml +++ b/nouveau/src/test/resources/nouveau.yaml @@ -8,15 +8,15 @@ logging: server: applicationConnectors: - - type: h2c - port: 8080 + - type: http bindHost: 127.0.0.1 - maxConcurrentStreams: 1024 - initialStreamRecvWindow: 65535 + port: 5987 + useDateHeader: false adminConnectors: - - type: h2c - port: 8081 + - type: http bindHost: 127.0.0.1 + port: 5988 + useDateHeader: false gzip: includedMethods: - GET diff --git a/src/nouveau/src/nouveau_util.erl b/src/nouveau/src/nouveau_util.erl index 57aaf12aa..b6dd0fcbd 100644 --- a/src/nouveau/src/nouveau_util.erl +++ b/src/nouveau/src/nouveau_util.erl @@ -197,7 +197,7 @@ get_local_purge_doc_body(LocalDocId, PurgeSeq, Index) -> couch_doc:from_json_obj(JsonList). nouveau_url() -> - config:get("nouveau", "url", "http://127.0.0.1:8080";). + config:get("nouveau", "url", "http://127.0.0.1:5987";). max_sessions() -> config:get_integer("nouveau", "max_sessions", 100). diff --git a/test/elixir/test/nouveau_test.exs b/test/elixir/test/nouveau_test.exs index c941896b4..fbfcbbd48 100644 --- a/test/elixir/test/nouveau_test.exs +++ b/test/elixir/test/nouveau_test.exs @@ -140,7 +140,7 @@ defmodule NouveauTest do end test "user-agent header is forbidden", context do - resp = Couch.get("http://127.0.0.01:8080";, + resp = Couch.get("http://127.0.0.1:5987";, headers: ["User-Agent": "couchdb"]) assert_status_code(resp, 403) end
