openstack/charm-cinder
Code Issues Proposed changes

Merge "Drop remaining usage of six"

Browse Source
This commit is contained in:
Zuul
2025-03-07 10:30:44 +00:00
committed by Gerrit Code Review
parent e95e788ed1 3ee5c42102
commit ac3081ece0
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
unit_tests/test_cinder_hooks.py
View File

@@ -12,11 +12,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from importlib import reload
import os import os
import json import json
from six.moves import reload_module
from unittest.mock import ( from unittest.mock import (
patch, patch,
call call
@@ -34,7 +33,7 @@ with patch('charmhelpers.contrib.hardening.harden.harden') as mock_dec:
with patch('cinder_utils.restart_map') as restart_map: with patch('cinder_utils.restart_map') as restart_map:
restart_map.return_value = RESTART_MAP restart_map.return_value = RESTART_MAP
import cinder_hooks as hooks import cinder_hooks as hooks
reload_module(hooks) reload(hooks)
hooks.hooks._config_save = False hooks.hooks._config_save = False
import cinder_utils as utils import cinder_utils as utils