diff options
author | Zuul <zuul@review.opendev.org> | 2023-01-19 13:39:54 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2023-01-19 13:39:54 +0000 |
commit | d182af1fb0401cee74f4969f9a276d741f5b3e2e (patch) | |
tree | f9370b7dae8e4da35eee494b1f909d5fcb4ceb3a | |
parent | c6ba09923f0a82b32a9ae2f3a74cef3c392b3d45 (diff) | |
parent | 2c9fbae54a1885fd9fbfb1459a1e88c4a0288979 (diff) | |
download | nova-d182af1fb0401cee74f4969f9a276d741f5b3e2e.tar.gz |
Merge "Clean up after ImportModulePoisonFixture"
-rw-r--r-- | nova/tests/fixtures/nova.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nova/tests/fixtures/nova.py b/nova/tests/fixtures/nova.py index 14bb8d0343..0c455e54e9 100644 --- a/nova/tests/fixtures/nova.py +++ b/nova/tests/fixtures/nova.py @@ -1832,14 +1832,16 @@ class ImportModulePoisonFixture(fixtures.Fixture): self.module_names = module_names self.fail_message = '' if isinstance(module_names, str): - self.module_names = set([module_names]) - sys.meta_path.insert(0, self.ForbiddenModules(self, self.module_names)) + self.module_names = {module_names} + self.meta_path_finder = self.ForbiddenModules(self, self.module_names) def setUp(self): super().setUp() self.addCleanup(self.cleanup) + sys.meta_path.insert(0, self.meta_path_finder) def cleanup(self): + sys.meta_path.remove(self.meta_path_finder) # We use a flag and check it during the cleanup phase to fail the test # if needed. This is done because some module imports occur inside of a # try-except block that ignores all exceptions, so raising an exception |