Merge pull request #279 from Venkat-Kunaparaju/timeout

Use test duration for curl and iperf connect timeouts

Author: wizhaoredhat

testTypeHttp.py

@@ -64,8 +64,10 @@ def _create_task_operation(self) -> TaskOperation:
             and external_url is not None
         )
 
+        timeout = int(self.get_duration() * 1.5)
+
         if use_internet:
-            cmd = f"curl -s -m 30 {external_url}"
+            cmd = f"curl -s -m {timeout} {external_url}"
             expected_string = (
                 tftbase.get_tft_external_server_string()
                 or _INTERNET_DEFAULT_SERVER_STRING
@@ -77,7 +79,7 @@ def _check_success_internet(r: host.Result) -> bool:
         else:
             server_ip = self.get_target_ip()
             target_port = self.get_target_port()
-            cmd = f"curl --fail -s --connect-timeout 5 http://{server_ip}:{target_port}/data"
+            cmd = f"curl --fail -s --connect-timeout {timeout} http://{server_ip}:{target_port}/data"
 
             def _check_success_podman(r: host.Result) -> bool:
                 return r.success and r.match(

testTypeIperf.py

@@ -141,8 +141,8 @@ def _create_task_operation(self) -> TaskOperation:
         target_port = self.get_target_port()
         cmd = f"{IPERF_EXE} -c {server_ip} -p {target_port} --json -t {self.get_duration()}"
 
-        if self.ts.test_case_id.info.expects_blocked:
-            cmd += " --connect-timeout 5000"
+        connect_timeout_ms = int(self.get_duration() * 1.5 * 1000)
+        cmd += f" --connect-timeout {connect_timeout_ms}"
 
         if self.test_type == TestType.IPERF_UDP:
             cmd += f" {IPERF_UDP_OPT}"