Fix and simplify perf usage with the test infra (#7160)

Author: achamayou

tests/acme_endorsement.py

@@ -51,7 +51,7 @@ def wait_for_certificates(
     args, network_name, root_cert, interface_name, challenge_interface, timeout=5
 ):
     with infra.network.network(
-        args.nodes, args.binary_dir, args.debug_nodes, args.perf_nodes, pdb=args.pdb
+        args.nodes, args.binary_dir, args.debug_nodes, pdb=args.pdb
     ) as network:
         network.start_and_open(args)
 
@@ -427,7 +427,7 @@ def run_unsecured(args):
         node.rpc_interfaces["unsecured_interface"] = challenge_server_interface
 
     with infra.network.network(
-        args.nodes, args.binary_dir, args.debug_nodes, args.perf_nodes, pdb=args.pdb
+        args.nodes, args.binary_dir, args.debug_nodes, pdb=args.pdb
     ) as network:
         network.start_and_open(args)
         test_unsecured_interfaces(network, "secured_interface", "unsecured_interface")

tests/client_protocols.py

@@ -135,7 +135,7 @@ def test_http2(network, args):
 
 def run(args):
     with infra.network.network(
-        args.nodes, args.binary_dir, args.debug_nodes, args.perf_nodes, pdb=args.pdb
+        args.nodes, args.binary_dir, args.debug_nodes, pdb=args.pdb
     ) as network:
         network.start_and_open(args)
         test_tls(network, args)
@@ -145,7 +145,7 @@ def run(args):
     args.http2 = True
     args.nodes = infra.e2e_args.nodes(args, 1)
     with infra.network.network(
-        args.nodes, args.binary_dir, args.debug_nodes, args.perf_nodes, pdb=args.pdb
+        args.nodes, args.binary_dir, args.debug_nodes, pdb=args.pdb
     ) as network:
         network.start_and_open(args)
         test_http2(network, args)

tests/code_update.py

@@ -874,7 +874,7 @@ def test_add_node_with_no_uvm_endorsements_in_kv(network, args):
 
 def run(args):
     with infra.network.network(
-        args.nodes, args.binary_dir, args.debug_nodes, args.perf_nodes, pdb=args.pdb
+        args.nodes, args.binary_dir, args.debug_nodes, pdb=args.pdb
     ) as network:
         network.start_and_open(args)
 

tests/commit_latency.py

@@ -79,7 +79,7 @@ def measure_commit_latency(args, sig_interval=100):
 
     times = []
     with infra.network.network(
-        args.nodes, args.binary_dir, args.debug_nodes, args.perf_nodes, pdb=args.pdb
+        args.nodes, args.binary_dir, args.debug_nodes, pdb=args.pdb
     ) as network:
         network.start_and_open(args)
 

tests/committable.py

@@ -40,7 +40,7 @@ def run(args):
     hosts = ["local://localhost"] * 5
 
     with infra.network.network(
-        hosts, args.binary_dir, args.debug_nodes, args.perf_nodes, pdb=args.pdb
+        hosts, args.binary_dir, args.debug_nodes, pdb=args.pdb
     ) as network:
         network.start_and_open(args)
         primary, backups = network.find_nodes()

tests/connections.py

@@ -72,7 +72,7 @@ def run_connection_caps_tests(args):
     args.ubsan_options = "suppressions=" + str(supp_file)
 
     with infra.network.network(
-        args.nodes, args.binary_dir, args.debug_nodes, args.perf_nodes, pdb=args.pdb
+        args.nodes, args.binary_dir, args.debug_nodes, pdb=args.pdb
     ) as network:
         check = infra.checker.Checker()
         network.start_and_open(args)
@@ -288,7 +288,7 @@ def verbose_sleep(sleep_time):
         args.idle_connection_timeout_s = timeout
 
         with infra.network.network(
-            args.nodes, args.binary_dir, args.debug_nodes, args.perf_nodes, pdb=args.pdb
+            args.nodes, args.binary_dir, args.debug_nodes, pdb=args.pdb
         ) as network:
             network.start_and_open(args)
 
@@ -343,7 +343,7 @@ def node_tcp_socket(node):
 # NB: This does rudimentary smoke testing. See fuzzing.py for more thorough test
 def run_node_socket_robustness_tests(args):
     with infra.network.network(
-        args.nodes, args.binary_dir, args.debug_nodes, args.perf_nodes, pdb=args.pdb
+        args.nodes, args.binary_dir, args.debug_nodes, pdb=args.pdb
     ) as network:
         network.start_and_open(args)
 

tests/consistency_trace_validation.py

@@ -13,7 +13,7 @@
 
 def run(args):
     with infra.network.network(
-        args.nodes, args.binary_dir, args.debug_nodes, args.perf_nodes, pdb=args.pdb
+        args.nodes, args.binary_dir, args.debug_nodes, pdb=args.pdb
     ) as network:
         network.start_and_open(args)
         targets = [

tests/e2e_batched.py

@@ -59,7 +59,7 @@ def test(network, args, batch_size=100, write_key_divisor=1, write_size_multipli
 
 def run(args):
     with infra.network.network(
-        args.nodes, args.binary_dir, args.debug_nodes, args.perf_nodes, pdb=args.pdb
+        args.nodes, args.binary_dir, args.debug_nodes, pdb=args.pdb
     ) as network:
         network.start_and_open(args)
 
@@ -91,7 +91,7 @@ def run(args):
 
 def run_to_destruction(args):
     with infra.network.network(
-        args.nodes, args.binary_dir, args.debug_nodes, args.perf_nodes, pdb=args.pdb
+        args.nodes, args.binary_dir, args.debug_nodes, pdb=args.pdb
     ) as network:
         network.start_and_open(args)
 

tests/e2e_common_endpoints.py

@@ -312,7 +312,7 @@ def get_sizes(n, http2):
 
 def run(args):
     with infra.network.network(
-        args.nodes, args.binary_dir, args.debug_nodes, args.perf_nodes, pdb=args.pdb
+        args.nodes, args.binary_dir, args.debug_nodes, pdb=args.pdb
     ) as network:
         network.start_and_open(args)
 

tests/e2e_logging.py

@@ -2150,7 +2150,6 @@ def run_udp_tests(args):
         args.nodes,
         args.binary_dir,
         args.debug_nodes,
-        args.perf_nodes,
         pdb=args.pdb,
         txs=txs,
     ) as network:
@@ -2179,7 +2178,6 @@ def additional_interfaces(local_node_id):
         args.nodes,
         args.binary_dir,
         args.debug_nodes,
-        args.perf_nodes,
         pdb=args.pdb,
         txs=txs,
     ) as network:
@@ -2194,7 +2192,6 @@ def run_app_space_js(args):
         args.nodes,
         args.binary_dir,
         args.debug_nodes,
-        args.perf_nodes,
         pdb=args.pdb,
         txs=txs,
     ) as network:
@@ -2315,7 +2312,6 @@ def run_parsing_errors(args):
         args.nodes,
         args.binary_dir,
         args.debug_nodes,
-        args.perf_nodes,
         pdb=args.pdb,
         txs=txs,
     ) as network: