summaryrefslogtreecommitdiff
path: root/tests/unittests/test_runs/test_merge_run.py
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@gmail.com>2016-05-12 14:25:32 -0700
committerJoshua Harlow <harlowja@gmail.com>2016-05-12 14:25:32 -0700
commit78cbc764486060928541b9dee6ce5779e622d1fa (patch)
tree48a886ea0a9857ce353eebe504048e656e1c6e92 /tests/unittests/test_runs/test_merge_run.py
parent690bdce9a73ec6d00b4eebbbca31cc527e7b2fce (diff)
parent811f7b5b3c4590ee4a16662db37b1f37541d9822 (diff)
downloadvyos-cloud-init-78cbc764486060928541b9dee6ce5779e622d1fa.tar.gz
vyos-cloud-init-78cbc764486060928541b9dee6ce5779e622d1fa.zip
Enable flake8 and fix a large amount of reported issues
Diffstat (limited to 'tests/unittests/test_runs/test_merge_run.py')
-rw-r--r--tests/unittests/test_runs/test_merge_run.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/unittests/test_runs/test_merge_run.py b/tests/unittests/test_runs/test_merge_run.py
index d0ec36a9..ce43798e 100644
--- a/tests/unittests/test_runs/test_merge_run.py
+++ b/tests/unittests/test_runs/test_merge_run.py
@@ -42,13 +42,13 @@ class TestMergeRun(helpers.FilesystemMockingTestCase):
args=[PER_INSTANCE],
freq=PER_INSTANCE)
mirrors = initer.distro.get_option('package_mirrors')
- self.assertEquals(1, len(mirrors))
+ self.assertEqual(1, len(mirrors))
mirror = mirrors[0]
- self.assertEquals(mirror['arches'], ['i386', 'amd64', 'blah'])
+ self.assertEqual(mirror['arches'], ['i386', 'amd64', 'blah'])
mods = stages.Modules(initer)
(which_ran, failures) = mods.run_section('cloud_init_modules')
self.assertTrue(len(failures) == 0)
self.assertTrue(os.path.exists('/etc/blah.ini'))
self.assertIn('write-files', which_ran)
contents = util.load_file('/etc/blah.ini')
- self.assertEquals(contents, 'blah')
+ self.assertEqual(contents, 'blah')