diff options
| author | Zuul <zuul@review.opendev.org> | 2023-02-09 09:05:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-02-09 09:05:27 +0000 |
| commit | 09514e2faadf9481b84c2fd5df0bb2253a14d01a (patch) | |
| tree | 181b337bf38d0909b53d523674057126e40c9c93 | |
| parent | 6ad74a024f6c769be11aa615906165d131272230 (diff) | |
| parent | 753bebbb2c4d78a2be7c204865e841729c43c032 (diff) | |
| download | zuul-09514e2faadf9481b84c2fd5df0bb2253a14d01a.tar.gz | |
Merge "Cleanup some Python ResourceWarnings in the test suite"
| -rw-r--r-- | noxfile.py | 4 | ||||
| -rw-r--r-- | tests/base.py | 2 | ||||
| -rw-r--r-- | tests/fakegitlab.py | 1 | ||||
| -rw-r--r-- | zuul/executor/server.py | 2 |
4 files changed, 9 insertions, 0 deletions
diff --git a/noxfile.py b/noxfile.py index cdba605f0..e920f053e 100644 --- a/noxfile.py +++ b/noxfile.py @@ -40,6 +40,10 @@ def set_standard_env_vars(session): 'always::DeprecationWarning:zuul.driver.sql.alembic.env', 'always::DeprecationWarning:zuul.driver.sql.alembic.script', ]) + # Set PYTHONTRACEMALLOC to a value greater than 0 in the calling env + # to get tracebacks of that depth for ResourceWarnings. Disabled by + # default as this consumes more resources and is slow. + set_env(session, 'PYTHONTRACEMALLOC', '0') @nox.session(python='3') diff --git a/tests/base.py b/tests/base.py index 8ac32f2d4..dcd316fab 100644 --- a/tests/base.py +++ b/tests/base.py @@ -1227,6 +1227,7 @@ class GerritWebServer(object): def stop(self): self.httpd.shutdown() self.thread.join() + self.httpd.server_close() class FakeGerritPoller(gerritconnection.GerritPoller): @@ -4082,6 +4083,7 @@ class WebProxyFixture(fixtures.Fixture): def _cleanup(self): self.httpd.shutdown() self.thread.join() + self.httpd.server_close() class ZuulWebFixture(fixtures.Fixture): diff --git a/tests/fakegitlab.py b/tests/fakegitlab.py index c4706b3b1..294887af0 100644 --- a/tests/fakegitlab.py +++ b/tests/fakegitlab.py @@ -262,3 +262,4 @@ class GitlabWebServer(object): def stop(self): self.httpd.shutdown() self.thread.join() + self.httpd.server_close() diff --git a/zuul/executor/server.py b/zuul/executor/server.py index c3737b5cc..82df57b77 100644 --- a/zuul/executor/server.py +++ b/zuul/executor/server.py @@ -3481,6 +3481,8 @@ class ExecutorServer(BaseMergeServer): self.statsd.gauge(base_key + '.load_average', 0) self.statsd.gauge(base_key + '.pct_used_ram', 0) self.statsd.gauge(base_key + '.running_builds', 0) + self.statsd.close() + self.statsd = None # Use the BaseMergeServer's stop method to disconnect from # ZooKeeper. We do this as one of the last steps to ensure |