openstack/heat-dashboard
Code Issues Proposed changes

Merge "Remove six usage (2/2)"

Browse Source
This commit is contained in:
Zuul 2020-01-22 06:20:52 +00:00 committed by Gerrit Code Review
commit 7842190851
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat_dashboard/api/heat.py
View File

@ -12,7 +12,7 @@
import contextlib import contextlib
from six.moves.urllib import request from urllib import request
from django.conf import settings from django.conf import settings
from oslo_serialization import jsonutils from oslo_serialization import jsonutils

22
heat_dashboard/test/tests/api/test_heat.py
View File

@ -13,7 +13,6 @@
import io import io
import mock import mock
import six
from django.conf import settings from django.conf import settings
from django.test.utils import override_settings from django.test.utils import override_settings
@ -257,8 +256,8 @@ class HeatApiTests(test.APITestCase):
files = api.heat.get_template_files(template_data=tmpl)[0] files = api.heat.get_template_files(template_data=tmpl)[0]
self.assertEqual(files, expected_files) self.assertEqual(files, expected_files)
@mock.patch.object(six.moves.urllib.request, 'urlopen') @mock.patch('heatclient.common.utils.read_url_content')
def test_get_template_files(self, mock_request): def test_get_template_files(self, mock_read_url_content):
tmpl = ''' tmpl = '''
# comment # comment
@ -276,14 +275,16 @@ class HeatApiTests(test.APITestCase):
expected_files = {u'http://test.example/example': b'echo "test"'} expected_files = {u'http://test.example/example': b'echo "test"'}
url = 'http://test.example/example' url = 'http://test.example/example'
data = b'echo "test"' data = b'echo "test"'
mock_request.return_value = io.BytesIO(data) mock_read_url_content.return_value = data
files = api.heat.get_template_files(template_data=tmpl)[0] files = api.heat.get_template_files(template_data=tmpl)[0]
self.assertEqual(files, expected_files) self.assertEqual(files, expected_files)
mock_request.assert_called_once_with(url) mock_read_url_content.assert_called_once_with(url)
@mock.patch.object(six.moves.urllib.request, 'urlopen') @mock.patch('urllib.request.urlopen')
def test_get_template_files_with_template_url(self, mock_request): @mock.patch('heatclient.common.utils.read_url_content')
def test_get_template_files_with_template_url(self, mock_read_url_content,
mock_request):
url = 'https://test.example/example.yaml' url = 'https://test.example/example.yaml'
data = b''' data = b'''
# comment # comment
@ -301,11 +302,14 @@ class HeatApiTests(test.APITestCase):
''' '''
data2 = b'echo "test"' data2 = b'echo "test"'
expected_files = {'http://test.example/example': b'echo "test"'} expected_files = {'http://test.example/example': b'echo "test"'}
mock_request.side_effect = \ mock_request.return_value = io.BytesIO(data)
[io.BytesIO(data), io.BytesIO(data2)] mock_read_url_content.return_value = data2
files = api.heat.get_template_files(template_url=url)[0] files = api.heat.get_template_files(template_url=url)[0]
self.assertEqual(files, expected_files) self.assertEqual(files, expected_files)
mock_request.assert_called_once_with(url)
mock_read_url_content.assert_called_once_with(
'http://test.example/example')
def test_get_template_files_invalid(self): def test_get_template_files_invalid(self):
tmpl = ''' tmpl = '''