Skip to content
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

Jump to bottom

tests: assertEquals -> assertEqual #117

Merged
merged 1 commit into from
Aug 24, 2024
Merged

tests: assertEquals -> assertEqual #117

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions imgconverter/qubesimgconverter/test_integ.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ def create_img(self, filename):
self.skipTest('failed to create test image: {}'.format(stdout))

def assertCorrectlyTransformed(self, orig_filename, trusted_filename):
self.assertEquals(
self.assertEqual(
self.vm.run('test -r "{}"'.format(trusted_filename), wait=True), 0)
self.assertEquals(
self.assertEqual(
self.vm.run('test -r "{}"'.format(orig_filename), wait=True), 0)
# retrieve original image too, to compensate for compression
p = self.vm.run('gm convert "{}" rgb:-'.format(orig_filename),
Expand All @@ -67,7 +67,7 @@ def assertCorrectlyTransformed(self, orig_filename, trusted_filename):
p = self.vm.run('gm convert "{}" rgb:-'.format(trusted_filename),
passio_popen=True)
trusted_image_data, _ = p.communicate()
self.assertEquals(orig_image_data, trusted_image_data)
self.assertEqual(orig_image_data, trusted_image_data)

def test_000_png(self):
self.create_img('test.png')
Expand All @@ -76,7 +76,7 @@ def test_000_png(self):
(stdout, _) = p.communicate()
if p.returncode == 127:
self.skipTest('qubes-img-converter not installed')
self.assertEquals(p.returncode, 0, 'qvm-convert-img failed: {}'.format(
self.assertEqual(p.returncode, 0, 'qvm-convert-img failed: {}'.format(
stdout))
self.assertCorrectlyTransformed('test.png', 'trusted.png')

Expand All @@ -88,7 +88,7 @@ def test_010_filename_with_spaces(self):
(stdout, _) = p.communicate()
if p.returncode == 127:
self.skipTest('qubes-img-converter not installed')
self.assertEquals(p.returncode, 0, 'qvm-convert-img failed: {}'.format(
self.assertEqual(p.returncode, 0, 'qvm-convert-img failed: {}'.format(
stdout))
self.assertCorrectlyTransformed(
'test with spaces.png', 'trusted with spaces.png')
Expand Down