openstack/python-mistralclient
Code Issues Proposed changes

Merge "Replace pkg_resources"

Browse Source
This commit is contained in:
Zuul
2025-07-20 11:50:46 +00:00
committed by Gerrit Code Review
parent 1e2c053197 265c5be4d5
commit f2426d827c
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mistralclient/tests/unit/v2/test_environments.py
View File

@@ -14,11 +14,10 @@
import collections import collections
import copy import copy
import os.path import importlib.resources
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
import pkg_resources as pkg
from urllib import parse from urllib import parse
from urllib import request from urllib import request
@@ -61,11 +60,9 @@ class TestEnvironmentsV2(base.BaseClientV2Test):
def test_create_with_json_file_uri(self): def test_create_with_json_file_uri(self):
# The contents of env_v2.json must be equivalent to ENVIRONMENT # The contents of env_v2.json must be equivalent to ENVIRONMENT
path = pkg.resource_filename( path = str(importlib.resources.files('mistralclient').joinpath(
'mistralclient',
'tests/unit/resources/env_v2.json' 'tests/unit/resources/env_v2.json'
) ))
path = os.path.abspath(path)
# Convert the file path to file URI # Convert the file path to file URI
uri = parse.urljoin('file:', request.pathname2url(path)) uri = parse.urljoin('file:', request.pathname2url(path))
@@ -115,10 +112,9 @@ class TestEnvironmentsV2(base.BaseClientV2Test):
def test_update_with_yaml_file(self): def test_update_with_yaml_file(self):
# The contents of env_v2.json must be equivalent to ENVIRONMENT # The contents of env_v2.json must be equivalent to ENVIRONMENT
path = pkg.resource_filename( path = str(importlib.resources.files('mistralclient').joinpath(
'mistralclient',
'tests/unit/resources/env_v2.json' 'tests/unit/resources/env_v2.json'
) ))
data = collections.OrderedDict( data = collections.OrderedDict(
utils.load_content( utils.load_content(
utils.get_contents_if_file(path) utils.get_contents_if_file(path)