diff --git a/imgconverter/qubesimgconverter/test_integ.py b/imgconverter/qubesimgconverter/test_integ.py index 8d8d3afc..49cf44d6 100644 --- a/imgconverter/qubesimgconverter/test_integ.py +++ b/imgconverter/qubesimgconverter/test_integ.py @@ -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), @@ -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') @@ -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') @@ -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')