Merge pull request #4924 from apache/nouveau-test-config

align nouveau test config with package
apache · Dec 19, 2023 · 584a721 · 584a721
2 parents 0c2ed86 + f6f0185
commit 584a721
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git 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 → nouveau/src/test/resources/nouveau.yaml b/nouveau/nouveau.yaml → 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
@@ -197,7 +197,7 @@ get_local_purge_doc_body(LocalDocId, PurgeSeq, Index) ->
     couch_doc:from_json_obj(JsonList).
 
 nouveau_url() ->
-    config:get("nouveau", "url", "https://127.0.0.1:8080").
+    config:get("nouveau", "url", "https://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
@@ -140,7 +140,7 @@ defmodule NouveauTest do
   end
 
   test "user-agent header is forbidden", context do
-    resp = Couch.get("https://127.0.0.01:8080",
+    resp = Couch.get("https://127.0.0.1:5987",
       headers: ["User-Agent": "couchdb"])
     assert_status_code(resp, 403)
   end