Merge remote-tracking branch 'teor/feature14175-chutney-performance-v2'

2 files changed, 30 insertions, 0 deletions

diff --git a/changes/feature14175-chutney-performance b/changes/feature14175-chutney-performance
new file mode 100644
index 0000000000..ba3a6fee4d
--- /dev/null
+++ b/changes/feature14175-chutney-performance
@@ -0,0 +1,9 @@
+  o Major enhancements (performance testing):
+    - Add chutney performance testing support to src/test/test-network.sh
+      The following arguments change how chutney verifies the network:
+      --bytes n             sends n bytes per test connection (10 KBytes)
+      --connections n       makes n test connections per client (1)
+      --hs-multi-client 1   makes each client connect to each HS (0)
+      Requires the corresponding chutney performance testing changes.
+      Note: using --connections 7 or greater on a HS will trigger #15937.
+      Patch by "teor".
diff --git a/src/test/test-network.sh b/src/test/test-network.sh
index ccfb5df424..49bf03c0d3 100755
--- a/src/test/test-network.sh
+++ b/src/test/test-network.sh
@@ -21,6 +21,27 @@ do
       export BOOTSTRAP_TIME="$2"
       shift
     ;;
+    # Environmental variables used by chutney verify performance tests
+    # Send this many bytes per client connection (10 KBytes)
+    --data|--data-bytes|--data-byte|--bytes|--byte)
+      export CHUTNEY_DATA_BYTES="$2"
+      shift
+    ;;
+    # Make this many connections per client (1)
+    # Note: If you create 7 or more connections to a hidden service from
+    # a single client, you'll likely get a verification failure due to
+    # https://trac.torproject.org/projects/tor/ticket/15937
+    --connections|--connection|--connection-count|--count)
+      export CHUTNEY_CONNECTIONS="$2"
+      shift
+    ;;
+    # Make each client connect to each HS (0)
+    # 0 means a single client connects to each HS
+    # 1 means every client connects to every HS
+    --hs-multi-client|--hs-multi-clients|--hs-client|--hs-clients)
+      export CHUTNEY_HS_MULTI_CLIENT="$2"
+      shift
+    ;;
     *)
       echo "Sorry, I don't know what to do with '$1'."
       exit 2