diff --git a/benchmarks/benchmarks.py b/benchmarks/benchmarks.py index 654c5c324..b4c22b358 100644 --- a/benchmarks/benchmarks.py +++ b/benchmarks/benchmarks.py @@ -9,5 +9,8 @@ if __name__ == '__main__': path = os.path.dirname(os.path.realpath(__file__)) - r = pytest.main(["--rootdir=" + path, "-x", path, "-p", "no:cacheprovider", *sys.argv]) + r = pytest.main([ + "--rootdir=" + path, "-x", path, "-p", "no:cacheprovider", "--log-level", "INFO", + "--log-cli-level", "INFO", *sys.argv + ]) exit(r) diff --git a/test/integration/integration_test.py b/test/integration/integration_test.py index b715408f4..6c49d974c 100644 --- a/test/integration/integration_test.py +++ b/test/integration/integration_test.py @@ -22,7 +22,11 @@ "-x", path, "-n", - "4" if utility.isSanitizerRun() else "20" # Number of tests to run in parallel + "4" if utility.isSanitizerRun() else "20", # Number of tests to run in parallel + "--log-level", + "INFO", + "--log-cli-level", + "INFO", ], plugins=["xdist"]) exit(r) diff --git a/test/integration/integration_test_fixtures.py b/test/integration/integration_test_fixtures.py index e256d53e4..7850eef26 100644 --- a/test/integration/integration_test_fixtures.py +++ b/test/integration/integration_test_fixtures.py @@ -75,7 +75,7 @@ def __init__(self, ip_version, server_config, backend_count=1): super(IntegrationTestBase, self).__init__() assert ip_version != IpVersion.UNKNOWN self.ip_version = ip_version - self.server_ip = "::/0" if ip_version == IpVersion.IPV6 else "0.0.0.0" + self.server_ip = "::" if ip_version == IpVersion.IPV6 else "0.0.0.0" self.server_ip = os.getenv("TEST_SERVER_EXTERNAL_IP", self.server_ip) self.tag = "" self.parameters = {} diff --git a/test/integration/nighthawk_test_server.py b/test/integration/nighthawk_test_server.py index 6a6deb849..e23911a3e 100644 --- a/test/integration/nighthawk_test_server.py +++ b/test/integration/nighthawk_test_server.py @@ -124,8 +124,8 @@ def _serverThreadRunner(self): logging.info("Test server popen() args: %s" % str.join(" ", args)) self._server_process = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout, stderr = self._server_process.communicate() - logging.debug(stdout.decode("utf-8")) - logging.debug(stderr.decode("utf-8")) + logging.info("Process stdout: %s", stdout.decode("utf-8")) + logging.info("Process stderr: %s", stderr.decode("utf-8")) def fetchJsonFromAdminInterface(self, path): """Fetch and parse json from the admin interface. @@ -183,7 +183,7 @@ def enableCpuProfiler(self): return r.status_code == 200 def _waitUntilServerListening(self): - # we allow 30 seconds for the server to have its listeners up. + # we allow some time for the server to have its listeners up. # (It seems that in sanitizer-enabled runs this can take a little while) timeout = time.time() + 60 while time.time() < timeout: diff --git a/test/integration/test_integration_basics.py b/test/integration/test_integration_basics.py index 5639fd99d..e1e36bee5 100644 --- a/test/integration/test_integration_basics.py +++ b/test/integration/test_integration_basics.py @@ -39,7 +39,7 @@ def test_http_h1(http_test_server_fixture): asserts.assertCounterEqual(counters, "upstream_cx_total", 1) asserts.assertCounterEqual( counters, "upstream_cx_tx_bytes_total", - 1400 if http_test_server_fixture.ip_version == IpVersion.IPV6 else 1450) + 1375 if http_test_server_fixture.ip_version == IpVersion.IPV6 else 1450) asserts.assertCounterEqual(counters, "upstream_rq_pending_total", 1) asserts.assertCounterEqual(counters, "upstream_rq_total", 25) asserts.assertCounterEqual(counters, "default.total_match_count", 1) @@ -223,7 +223,7 @@ def test_https_h1(https_test_server_fixture): asserts.assertCounterEqual(counters, "upstream_cx_total", 1) asserts.assertCounterEqual( counters, "upstream_cx_tx_bytes_total", - 1400 if https_test_server_fixture.ip_version == IpVersion.IPV6 else 1450) + 1375 if https_test_server_fixture.ip_version == IpVersion.IPV6 else 1450) asserts.assertCounterEqual(counters, "upstream_rq_pending_total", 1) asserts.assertCounterEqual(counters, "upstream_rq_total", 25) asserts.assertCounterEqual(counters, "ssl.ciphers.ECDHE-RSA-AES128-GCM-SHA256", 1)