openstack/swift
Code Issues Proposed changes

tests: drop pkg_resources from test_auditor.py

Browse Source 
We need to get rid of pkg_resources for py312. Fortunately,
we already use the load_pkg_resources() wrapper everywhere.
And, the tests of watchers already mock it. So, the general
mocking of pkg_resources was not doing anything, and this
patch simply deletes it.

Change-Id: Ifbdbbe18d6df6df377f0d914a097328d9c9e95ee
This commit is contained in:
Pete Zaitcev 2023-10-11 12:04:42 -05:00
parent d31a54a65c
commit 002ad59c9e
2 changed files with 1 additions and 10 deletions
swift/obj/watchers
dark_data.py
test/unit/obj
test_auditor.py

2
swift/obj/watchers/dark_data.py

@ -16,7 +16,7 @@
# #
# This is an audit watcher that manages the dark data in the cluster. # This is an audit watcher that manages the dark data in the cluster.
# Since the API for audit watchers is intended to use external plugins, # Since the API for audit watchers is intended to use external plugins,
# this code is invoked as if it were external: through pkg_resources. # this code is invoked as if it were external: through load_pkg_resources().
# Our setup.py comes pre-configured for convenience, but the operator has # Our setup.py comes pre-configured for convenience, but the operator has
# to enable this watcher honestly by additing DarkDataWatcher to watchers= # to enable this watcher honestly by additing DarkDataWatcher to watchers=
# in object-server.conf. The default is off, as if this does not exist. # in object-server.conf. The default is off, as if this does not exist.

9
test/unit/obj/test_auditor.py

@ -17,7 +17,6 @@ import unittest
import json import json
import mock import mock
import os import os
import pkg_resources
import signal import signal
import string import string
import sys import sys
@ -67,13 +66,6 @@ def works_only_once(callable_thing, exception):
return only_once return only_once
def no_audit_watchers(group, name=None):
if group == 'swift.object_audit_watcher':
return iter([])
else:
return pkg_resources.iter_entry_points(group, name)
class FakeRing1(object): class FakeRing1(object):
def __init__(self, swift_dir, ring_name=None): def __init__(self, swift_dir, ring_name=None):
@ -1595,7 +1587,6 @@ class TestAuditor(TestAuditorBase):
.format(outstanding_pids)) .format(outstanding_pids))
@mock.patch('pkg_resources.iter_entry_points', no_audit_watchers)
@patch_policies(_mocked_policies) @patch_policies(_mocked_policies)
class TestAuditWatchers(TestAuditorBase): class TestAuditWatchers(TestAuditorBase):