Fix sound format tests

.gitignore

@@ -8,3 +8,4 @@ doc/_build
 *.egg-info
 .DS_Store
 examples_dev
+/test/failed-image/

setup.py

@@ -1,4 +1,3 @@
-import sys
 import os.path
 from setuptools import setup
 import pgzero
@@ -8,7 +7,7 @@
     LONG_DESCRIPTION = f.read()
 
 install_requires = [
-    'pygame>=1.9.2',
+    'pygame~=2.0',
     'numpy',
 ]
 

test/test_sound_formats.py

@@ -1,5 +1,4 @@
-import sys
-from unittest import TestCase, expectedFailure, skip
+from unittest import TestCase, skip
 import pygame
 from pgzero.loaders import sounds, set_root, UnsupportedFormat
 
@@ -32,43 +31,24 @@ def test_load_22k8bitpcm(self):
     def test_load_22kadpcm(self):
         self.assert_loadable('wav22kadpcm')
 
-    @expectedFailure  # See issue #22 - 8Khz files don't open correctly
     def test_load_8k16bitpcm(self):
         self.assert_loadable('wav8k16bitpcm')
 
-    @expectedFailure  # See issue #22 - 8Khz files don't open correctly
     def test_load_8k8bitpcm(self):
         self.assert_loadable('wav8k8bitpcm')
 
-    @expectedFailure  # See issue #22 - 8Khz files don't open correctly
     def test_load_8kadpcm(self):
         self.assert_loadable('wav8kadpcm')
 
-    @skip(
-        'This test crashes - reported upstream as '
-        'https://github.com/pygame/pygame/issues/406'
-    )
     def test_load_11kgsm(self):
         self.assert_errmsg('wav22kgsm', 'WAV audio encoded as GSM')
 
-    @skip(
-        'This test crashes - reported upstream as '
-        'https://github.com/pygame/pygame/issues/406'
-    )
     def test_load_11kulaw(self):
-        self.assert_errmsg('wav22kulaw', 'WAV audio encoded as .* µ-law')
+        self.assert_loadable('wav22kulaw')
 
-    @skip(
-        'This test crashes - reported upstream as '
-        'https://github.com/pygame/pygame/issues/406'
-    )
     def test_load_8kmp316(self):
         self.assert_errmsg('wav8kmp316', 'WAV audio encoded as MP3')
 
-    @skip(
-        'This test crashes - reported upstream as '
-        'https://github.com/pygame/pygame/issues/406'
-    )
     def test_load_8kmp38(self):
         self.assert_errmsg('wav8kmp38', 'WAV audio encoded as MP3')