summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-09-02 02:27:46 +0000
committerGerrit Code Review <review@openstack.org>2021-09-02 02:27:46 +0000
commit983f0abc58428c24d428362eebc26367ca1ae42e (patch)
treebdacb4aa743ce529cdb8990e68cd9bdc9a49502e
parente647baf4ca64a1c522c1ea04ea00808d198c9909 (diff)
parentf83108d85874a87e47b51af3eebc9faeeb11faa0 (diff)
downloadpython-neutronclient-983f0abc58428c24d428362eebc26367ca1ae42e.tar.gz
Merge "Use yaml.safe_load instead of yaml.load"xena-em7.6.0
-rw-r--r--neutronclient/tests/functional/core/test_cli_formatter.py2
-rw-r--r--neutronclient/tests/unit/test_cli20.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/neutronclient/tests/functional/core/test_cli_formatter.py b/neutronclient/tests/functional/core/test_cli_formatter.py
index cd133de..145ed6c 100644
--- a/neutronclient/tests/functional/core/test_cli_formatter.py
+++ b/neutronclient/tests/functional/core/test_cli_formatter.py
@@ -43,7 +43,7 @@ class TestCLIFormatter(base.ClientTestBase):
result = self._create_net('yaml', ['name', 'admin_state_up'])
self.assertDictEqual({'name': self.net_name,
'admin_state_up': True},
- yaml.load(result))
+ yaml.safe_load(result))
def test_net_create_with_value_formatter(self):
# NOTE(amotoki): In 'value' formatter, there is no guarantee
diff --git a/neutronclient/tests/unit/test_cli20.py b/neutronclient/tests/unit/test_cli20.py
index c2143e1..a067ee8 100644
--- a/neutronclient/tests/unit/test_cli20.py
+++ b/neutronclient/tests/unit/test_cli20.py
@@ -1159,7 +1159,7 @@ class CLITestV20OutputFormatter(CLITestV20Base):
def test_create_resource_yaml(self):
self._test_create_resource_with_formatter('yaml')
- data = yaml.load(self.fake_stdout.make_string())
+ data = yaml.safe_load(self.fake_stdout.make_string())
self.assertEqual('myname', data['name'])
self.assertEqual('myid', data['id'])
@@ -1184,7 +1184,7 @@ class CLITestV20OutputFormatter(CLITestV20Base):
def test_show_resource_yaml(self):
self._test_show_resource_with_formatter('yaml')
- data = yaml.load(''.join(self.fake_stdout.content))
+ data = yaml.safe_load(''.join(self.fake_stdout.content))
self.assertEqual('myname', data['name'])
self.assertEqual('myid', data['id'])
@@ -1211,5 +1211,5 @@ class CLITestV20OutputFormatter(CLITestV20Base):
def test_list_resources_yaml(self):
self._test_list_resources_with_formatter('yaml')
- data = yaml.load(''.join(self.fake_stdout.content))
+ data = yaml.safe_load(''.join(self.fake_stdout.content))
self.assertEqual(['myid1', 'myid2'], [d['id'] for d in data])