← Back to branch summary

~barryprice/juju-deployer/resolve-OpenStack-1501-option-errors

« back to all changes in this revision

Viewing changes to deployer/tests/test_diff.py

  • Committer: Barry Price
  • Date: 2020-10-07 11:36:19 UTC
  • Revision ID: barry.price@canonical.com-20201007113619-gbfomqsxhbkyxc8b
Fix yaml.load() deprecation warnings by using SafeLoader

Show diffs side-by-side

added added

removed removed

Lines of Context:
deployer/tests/test_diff.py
5
5
import shutil
6
6
import tempfile
7
7
import unittest
 
8
 
 
9
try:
 
10
    from yaml import CSafeLoader, CSafeDumper
 
11
    SafeLoader, SafeDumper = CSafeLoader, CSafeDumper
 
12
except ImportError:
 
13
    from yaml import SafeLoader
 
14
 
8
15
import yaml
9
16
 
10
17
from mock import patch, mock_open
143
150
        edited_config_file = os.path.join(self.get_dir(), 'saved.yaml')
144
151
        dpl.save(edited_config_file)
145
152
        # in memory edit yaml content
146
 
        edited_config = yaml.load(open(edited_config_file))
 
153
        edited_config = yaml.load(open(edited_config_file), Loader=SafeLoader)
147
154
        edited_config["relations"].remove(
148
155
            ['nova-compute:amqp', 'rabbitmq-server:amqp'])
149
156
        edited_config = yaml.dump({'openstack': edited_config})
168
175
        edited_config_file = os.path.join(self.get_dir(), 'saved.yaml')
169
176
        dpl.save(edited_config_file)
170
177
        # in memory edit yaml content
171
 
        edited_config = yaml.load(open(edited_config_file))
 
178
        edited_config = yaml.load(open(edited_config_file), Loader=SafeLoader)
172
179
        edited_config["relations"].remove(
173
180
            ['ceilometer:identity-service', 'keystone:identity-service'])
174
181
        edited_config = yaml.dump({'openstack': edited_config})
193
200
        edited_config_file = os.path.join(self.get_dir(), 'saved.yaml')
194
201
        dpl.save(edited_config_file)
195
202
        # in memory edit yaml content
196
 
        edited_config = yaml.load(open(edited_config_file))
 
203
        edited_config = yaml.load(open(edited_config_file), Loader=SafeLoader)
197
204
        # remove ':name' from service endpoint specification
198
205
        for relation in edited_config["relations"]:
199
206
            relation = [(relation[0] + ":").split(":")[0],