Skip to content

Fix integration tests when running with IPv6. #579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mum4k merged 3 commits into from
Dec 2, 2020
Merged

Fix integration tests when running with IPv6. #579

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a94faf
Fix integration tests when running with IPv6.
mum4k Dec 1, 2020
55c3b8f
COnfiguring more logging for pytest in benchmarks.py.
mum4k Dec 1, 2020
6897640
Reverting change to sleep time in nighthawk_test_server.py.
mum4k Dec 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion benchmarks/benchmarks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
6 changes: 5 additions & 1 deletion test/integration/integration_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion test/integration/integration_test_fixtures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {}
Expand Down
8 changes: 4 additions & 4 deletions test/integration/nighthawk_test_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -183,13 +183,13 @@ 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:
if self._tryUpdateFromAdminInterface():
return True
time.sleep(0.1)
Comment thread
mum4k marked this conversation as resolved.
time.sleep(1)
logging.error("Timeout in _waitUntilServerListening()")
return False

Expand Down
4 changes: 2 additions & 2 deletions test/integration/test_integration_basics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down