Skip to content

Fix two minor warnings #475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OddBloke merged 3 commits into from
Jul 13, 2020
Merged

Fix two minor warnings #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d23815
cc_puppet: warning fix
OddBloke Jul 2, 2020
146c7b0
test_gce: warning fix
OddBloke Jul 2, 2020
ebed153
Merge branch 'master' into warnings
OddBloke Jul 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cloudinit/config/cc_puppet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,9 @@ def handle(name, cfg, cloud, log, _args):
cleaned_lines = [i.lstrip() for i in contents.splitlines()]
cleaned_contents = '\n'.join(cleaned_lines)
# Move to puppet_config.read_file when dropping py2.7
puppet_config.readfp( # pylint: disable=W1505
puppet_config.read_file(
StringIO(cleaned_contents),
filename=p_constants.conf_path)
source=p_constants.conf_path)
for (cfg_name, cfg) in puppet_cfg['conf'].items():
# Cert configuration is a special case
# Dump the puppet master ca certificate in the correct place
Expand Down
3 changes: 2 additions & 1 deletion tests/unittests/test_datasource/test_gce.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ def test_connection(self):
self.assertTrue(success)

req_header = httpretty.last_request().headers
self.assertDictContainsSubset(HEADERS, req_header)
for header_name, expected_value in HEADERS.items():
self.assertEqual(expected_value, req_header.get(header_name))

def test_metadata(self):
# UnicodeDecodeError if set to ds.userdata instead of userdata_raw
Expand Down