Browse Source

tests/http: do not save files for downloads in scorecard testing

Closes #10788
Stefan Eissing 1 year ago
parent
commit
b00289843a
2 changed files with 13 additions and 7 deletions
  1. 4 4
      tests/http/scorecard.py
  2. 9 3
      tests/http/testenv/curl.py

+ 4 - 4
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:

+ 9 - 3
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))