--- a/tests/test-stream-bundle-v2.t Wed Mar 05 22:33:11 2025 +0100
+++ b/tests/test-stream-bundle-v2.t Wed Mar 05 23:02:19 2025 +0100
@@ -1,6 +1,18 @@
-#require no-reposimplestore
+#testcases stream-v2 stream-v3
+#testcases threaded sequential
-#testcases stream-v2 stream-v3
+#if threaded
+ $ cat << EOF >> $HGRCPATH
+ > [worker]
+ > parallel-stream-bundle-processing = yes
+ > parallel-stream-bundle-processing.num-writer = 2
+ > EOF
+#else
+ $ cat << EOF >> $HGRCPATH
+ > [worker]
+ > parallel-stream-bundle-processing = no
+ > EOF
+#endif
#if stream-v2
$ bundle_format="streamv2"
@@ -199,10 +211,10 @@
adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v2 (7 bytes)
adding [c] rbc-revs-v2 (40 bytes)
- transferred 1.65 KB in * seconds (* */sec) (glob) (no-rust !)
bundle2-input-part: total payload size 1857 (no-rust !)
- transferred 1.78 KB in * seconds (* */sec) (glob) (rust !)
bundle2-input-part: total payload size 2025 (rust !)
+ stream-cloned 12 files / 1.65 KB in * seconds (* */sec) (glob) (no-rust !)
+ stream-cloned 14 files / 1.78 KB in * seconds (* */sec) (glob) (rust !)
bundle2-input-bundle: 1 parts total
updating the branch cache
finished applying clone bundle
@@ -236,7 +248,12 @@
updating the branch cache
(sent 4 HTTP requests and * bytes; received * bytes in responses) (glob)
- $ hg clone --stream http://localhost:$HGPORT stream-clone-explicit --debug
+test explicite stream request
+
+(also test unlimited memory usage code path)
+
+ $ hg clone --stream http://localhost:$HGPORT stream-clone-explicit --debug \
+ > --config worker.parallel-stream-bundle-processing.memory-target=-1
using http://localhost:$HGPORT/
sending capabilities command
sending clonebundles_manifest command
@@ -262,10 +279,10 @@
adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v2 (7 bytes)
adding [c] rbc-revs-v2 (40 bytes)
- transferred 1.65 KB in * seconds (* */sec) (glob) (no-rust !)
bundle2-input-part: total payload size 1857 (no-rust !)
- transferred 1.78 KB in * seconds (* */sec) (glob) (rust !)
bundle2-input-part: total payload size 2025 (rust !)
+ stream-cloned 12 files / 1.65 KB in * seconds (* */sec) (glob) (no-rust !)
+ stream-cloned 14 files / 1.78 KB in * seconds (* */sec) (glob) (rust !)
bundle2-input-bundle: 1 parts total
updating the branch cache
finished applying clone bundle
@@ -327,9 +344,9 @@
adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v2 (7 bytes)
adding [c] rbc-revs-v2 (40 bytes)
- transferred 1.65 KB in * seconds (* */sec) (glob) (no-rust !)
+ stream-cloned 12 files / 1.65 KB in * seconds (* */sec) (glob) (no-rust !)
bundle2-input-part: total payload size 1869 (no-rust !)
- transferred 1.78 KB in * seconds (* */sec) (glob) (rust !)
+ stream-cloned 14 files / 1.78 KB in * seconds (* */sec) (glob) (rust !)
bundle2-input-part: total payload size 2037 (rust !)
bundle2-input-bundle: 1 parts total
updating the branch cache
@@ -389,9 +406,9 @@
adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v2 (7 bytes)
adding [c] rbc-revs-v2 (40 bytes)
- transferred 1.65 KB in * seconds (* */sec) (glob) (no-rust !)
+ stream-cloned 12 files / 1.65 KB in * seconds (* */sec) (glob) (no-rust !)
bundle2-input-part: total payload size 1869 (no-rust !)
- transferred 1.78 KB in * seconds (* */sec) (glob) (rust !)
+ stream-cloned 14 files / 1.78 KB in * seconds (* */sec) (glob) (rust !)
bundle2-input-part: total payload size 2037 (rust !)
bundle2-input-bundle: 1 parts total
updating the branch cache