@@ -56,9 +56,9 @@ def create_img(self, filename):
56
56
self .skipTest ('failed to create test image: {}' .format (stdout ))
57
57
58
58
def assertCorrectlyTransformed (self , orig_filename , trusted_filename ):
59
- self .assertEquals (
59
+ self .assertEqual (
60
60
self .vm .run ('test -r "{}"' .format (trusted_filename ), wait = True ), 0 )
61
- self .assertEquals (
61
+ self .assertEqual (
62
62
self .vm .run ('test -r "{}"' .format (orig_filename ), wait = True ), 0 )
63
63
# retrieve original image too, to compensate for compression
64
64
p = self .vm .run ('gm convert "{}" rgb:-' .format (orig_filename ),
@@ -67,7 +67,7 @@ def assertCorrectlyTransformed(self, orig_filename, trusted_filename):
67
67
p = self .vm .run ('gm convert "{}" rgb:-' .format (trusted_filename ),
68
68
passio_popen = True )
69
69
trusted_image_data , _ = p .communicate ()
70
- self .assertEquals (orig_image_data , trusted_image_data )
70
+ self .assertEqual (orig_image_data , trusted_image_data )
71
71
72
72
def test_000_png (self ):
73
73
self .create_img ('test.png' )
@@ -76,7 +76,7 @@ def test_000_png(self):
76
76
(stdout , _ ) = p .communicate ()
77
77
if p .returncode == 127 :
78
78
self .skipTest ('qubes-img-converter not installed' )
79
- self .assertEquals (p .returncode , 0 , 'qvm-convert-img failed: {}' .format (
79
+ self .assertEqual (p .returncode , 0 , 'qvm-convert-img failed: {}' .format (
80
80
stdout ))
81
81
self .assertCorrectlyTransformed ('test.png' , 'trusted.png' )
82
82
@@ -88,7 +88,7 @@ def test_010_filename_with_spaces(self):
88
88
(stdout , _ ) = p .communicate ()
89
89
if p .returncode == 127 :
90
90
self .skipTest ('qubes-img-converter not installed' )
91
- self .assertEquals (p .returncode , 0 , 'qvm-convert-img failed: {}' .format (
91
+ self .assertEqual (p .returncode , 0 , 'qvm-convert-img failed: {}' .format (
92
92
stdout ))
93
93
self .assertCorrectlyTransformed (
94
94
'test with spaces.png' , 'trusted with spaces.png' )
0 commit comments