fix test deprecation warnings

Author: willmcgugan

fs/test.py

@@ -1061,7 +1061,7 @@ def test_remove(self):
         self.fs.makedirs("foo/bar/baz/")
 
         error_msg = "resource 'foo/bar/egg/test.txt' not found"
-        with self.assertRaisesRegexp(errors.ResourceNotFound, error_msg):
+        with self.assertRaisesRegex(errors.ResourceNotFound, error_msg):
             self.fs.remove("foo/bar/egg/test.txt")
 
     def test_removedir(self):

tests/test_base.py

@@ -8,7 +8,7 @@
 from fs import errors
 
 
-class TestFS(FS):
+class DummyFS(FS):
     def getinfo(self, path, namespaces=None):
         pass
 
@@ -33,7 +33,7 @@ def setinfo(self, path, info):
 
 class TestBase(unittest.TestCase):
     def setUp(self):
-        self.fs = TestFS()
+        self.fs = DummyFS()
 
     def test_validatepath(self):
         """Test validatepath method."""

tests/test_iotools.py

@@ -26,7 +26,7 @@ def test_make_stream(self):
 
         with self.fs.openbin("foo.bin") as f:
             data = f.read()
-            self.assert_(isinstance(data, bytes))
+            self.assertTrue(isinstance(data, bytes))
 
         with self.fs.openbin("text.txt", "wb") as f:
             f.write(UNICODE_TEXT.encode("utf-8"))

tests/test_path.py

@@ -152,14 +152,14 @@ def test_splitext(self):
         self.assertEqual(splitext(".foo"), (".foo", ""))
 
     def test_recursepath(self):
-        self.assertEquals(recursepath("/"), ["/"])
-        self.assertEquals(recursepath("hello"), ["/", "/hello"])
-        self.assertEquals(recursepath("/hello/world/"), ["/", "/hello", "/hello/world"])
-        self.assertEquals(
+        self.assertEqual(recursepath("/"), ["/"])
+        self.assertEqual(recursepath("hello"), ["/", "/hello"])
+        self.assertEqual(recursepath("/hello/world/"), ["/", "/hello", "/hello/world"])
+        self.assertEqual(
             recursepath("/hello/world/", reverse=True), ["/hello/world", "/hello", "/"]
         )
-        self.assertEquals(recursepath("hello", reverse=True), ["/hello", "/"])
-        self.assertEquals(recursepath("", reverse=True), ["/"])
+        self.assertEqual(recursepath("hello", reverse=True), ["/hello", "/"])
+        self.assertEqual(recursepath("", reverse=True), ["/"])
 
     def test_isbase(self):
         self.assertTrue(isbase("foo", "foo/bar"))
@@ -178,7 +178,7 @@ def test_issamedir(self):
 
     def test_isdotfile(self):
         for path in [".foo", ".svn", "foo/.svn", "foo/bar/.svn", "/foo/.bar"]:
-            self.assert_(isdotfile(path))
+            self.assertTrue(isdotfile(path))
 
         for path in ["asfoo", "df.svn", "foo/er.svn", "foo/bar/test.txt", "/foo/bar"]:
             self.assertFalse(isdotfile(path))
@@ -201,10 +201,10 @@ def test_basename(self):
             self.assertEqual(basename(path), test_basename)
 
     def test_iswildcard(self):
-        self.assert_(iswildcard("*"))
-        self.assert_(iswildcard("*.jpg"))
-        self.assert_(iswildcard("foo/*"))
-        self.assert_(iswildcard("foo/{}"))
+        self.assertTrue(iswildcard("*"))
+        self.assertTrue(iswildcard("*.jpg"))
+        self.assertTrue(iswildcard("foo/*"))
+        self.assertTrue(iswildcard("foo/{}"))
         self.assertFalse(iswildcard("foo"))
         self.assertFalse(iswildcard("img.jpg"))
         self.assertFalse(iswildcard("foo/bar"))