diff options
author | Stefan Eissing <stefan@eissing.org> | 2023-03-17 16:36:51 +0100 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2023-03-17 23:01:04 +0100 |
commit | b00289843a73e5ca032f993128797d7c265b6e58 (patch) | |
tree | 0b6c594c93b6c4e05db073727244c8a9d943ef5f | |
parent | 138860576fe7d1fd6aa2829d745292f83dd3b475 (diff) | |
download | curl-b00289843a73e5ca032f993128797d7c265b6e58.tar.gz |
tests/http: do not save files for downloads in scorecard testing
Closes #10788
-rw-r--r-- | tests/http/scorecard.py | 8 | ||||
-rw-r--r-- | tests/http/testenv/curl.py | 12 |
2 files changed, 13 insertions, 7 deletions
diff --git a/tests/http/scorecard.py b/tests/http/scorecard.py index c153beac9..21dafe181 100644 --- a/tests/http/scorecard.py +++ b/tests/http/scorecard.py @@ -72,7 +72,7 @@ class ScoreCard: self.info('.') curl = CurlClient(env=self.env) url = f'https://{authority}/' - r = curl.http_download(urls=[url], alpn_proto=proto) + r = curl.http_download(urls=[url], alpn_proto=proto, no_save=True) if r.exit_code == 0 and len(r.stats) == 1: c_samples.append(r.stats[0]['time_connect']) hs_samples.append(r.stats[0]['time_appconnect']) @@ -141,7 +141,7 @@ class ScoreCard: self.info(f'{sample_size}x single') for i in range(sample_size): curl = CurlClient(env=self.env) - r = curl.http_download(urls=[url], alpn_proto=proto) + r = curl.http_download(urls=[url], alpn_proto=proto, no_save=True) err = self._check_downloads(r, count) if err: errors.append(err) @@ -163,7 +163,7 @@ class ScoreCard: self.info(f'{sample_size}x{count} serial') for i in range(sample_size): curl = CurlClient(env=self.env) - r = curl.http_download(urls=[url], alpn_proto=proto) + r = curl.http_download(urls=[url], alpn_proto=proto, no_save=True) self.info(f'.') err = self._check_downloads(r, count) if err: @@ -187,7 +187,7 @@ class ScoreCard: for i in range(sample_size): curl = CurlClient(env=self.env) start = datetime.now() - r = curl.http_download(urls=[url], alpn_proto=proto, + r = curl.http_download(urls=[url], alpn_proto=proto, no_save=True, extra_args=['--parallel']) err = self._check_downloads(r, count) if err: diff --git a/tests/http/testenv/curl.py b/tests/http/testenv/curl.py index 5a953afb0..ec832eca0 100644 --- a/tests/http/testenv/curl.py +++ b/tests/http/testenv/curl.py @@ -235,12 +235,18 @@ class CurlClient: alpn_proto: Optional[str] = None, with_stats: bool = True, with_headers: bool = False, + no_save: bool = False, extra_args: List[str] = None): if extra_args is None: extra_args = [] - extra_args.extend([ - '-o', 'download_#1.data', - ]) + if no_save: + extra_args.extend([ + '-o', '/dev/null', + ]) + else: + extra_args.extend([ + '-o', 'download_#1.data', + ]) # remove any existing ones for i in range(100): self._rmf(self.download_file(i)) |