summaryrefslogtreecommitdiff
path: root/cloudinit/tests
diff options
context:
space:
mode:
authorParide Legovini <paride.legovini@canonical.com>2021-09-21 22:28:30 +0200
committerGitHub <noreply@github.com>2021-09-21 15:28:30 -0500
commit089a307db1fc572461eea1589f1876132c058311 (patch)
tree9d2c32e4e56bf06a4d62a570691730a0d73b8e41 /cloudinit/tests
parente27c30748e88409b1646a552f994edf9ed9d017e (diff)
downloadvyos-cloud-init-089a307db1fc572461eea1589f1876132c058311.tar.gz
vyos-cloud-init-089a307db1fc572461eea1589f1876132c058311.zip
tox: bump the pinned flake8 and pylint version (#1029)
tox: bump the pinned flake8 and pylint version * pylint: fix W1406 (redundant-u-string-prefix) The u prefix for strings is no longer necessary in Python >=3.0. * pylint: disable W1514 (unspecified-encoding) From https://www.python.org/dev/peps/pep-0597/ (Python 3.10): The new warning stems form https://www.python.org/dev/peps/pep-0597, which says: Developers using macOS or Linux may forget that the default encoding is not always UTF-8. [...] Even Python experts may assume that the default encoding is UTF-8. This creates bugs that only happen on Windows. The warning could be fixed by always specifying encoding='utf-8', however we should be careful to not break environments which are not utf-8 (or explicitly state that only utf-8 is supported). Let's silence the warning for now. * _quick_read_instance_id: cover the case where load_yaml() returns None Spotted by pylint: - E1135 (unsupported-membership-test) - E1136 (unsubscriptable-object) LP: #1944414
Diffstat (limited to 'cloudinit/tests')
-rw-r--r--cloudinit/tests/test_subp.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/cloudinit/tests/test_subp.py b/cloudinit/tests/test_subp.py
index 911c1f3d..515d5d64 100644
--- a/cloudinit/tests/test_subp.py
+++ b/cloudinit/tests/test_subp.py
@@ -91,8 +91,8 @@ class TestSubp(CiTestCase):
tmp_file = self.tmp_path('test.out')
cmd = 'echo HI MOM >> {tmp_file}'.format(tmp_file=tmp_file)
(out, _err) = subp.subp(cmd.encode('utf-8'), shell=True)
- self.assertEqual(u'', out)
- self.assertEqual(u'', _err)
+ self.assertEqual('', out)
+ self.assertEqual('', _err)
self.assertEqual('HI MOM\n', util.load_file(tmp_file))
def test_subp_handles_strings(self):
@@ -100,8 +100,8 @@ class TestSubp(CiTestCase):
tmp_file = self.tmp_path('test.out')
cmd = 'echo HI MOM >> {tmp_file}'.format(tmp_file=tmp_file)
(out, _err) = subp.subp(cmd, shell=True)
- self.assertEqual(u'', out)
- self.assertEqual(u'', _err)
+ self.assertEqual('', out)
+ self.assertEqual('', _err)
self.assertEqual('HI MOM\n', util.load_file(tmp_file))
def test_subp_handles_utf8(self):