Make upload /download tests in FSTestCases faster by only building data once

Author: althonos

fs/test.py

@@ -247,6 +247,11 @@
 class FSTestCases(object):
     """Basic FS tests."""
 
+    data1 = b"foo" * 256 * 1024
+    data2 = b"bar" * 2 * 256 * 1024
+    data3 = b"baz" * 3 * 256 * 1024
+    data4 = b"egg" * 7 * 256 * 1024
+
     def make_fs(self):
         """Return an FS instance."""
         raise NotImplementedError("implement me")
@@ -1191,22 +1196,17 @@ def test_copy(self):
 
     def _test_upload(self, workers):
         """Test fs.copy with varying number of worker threads."""
-        data1 = b"foo" * 256 * 1024
-        data2 = b"bar" * 2 * 256 * 1024
-        data3 = b"baz" * 3 * 256 * 1024
-        data4 = b"egg" * 7 * 256 * 1024
-
         with open_fs("temp://") as src_fs:
-            src_fs.writebytes("foo", data1)
-            src_fs.writebytes("bar", data2)
-            src_fs.makedir("dir1").writebytes("baz", data3)
-            src_fs.makedirs("dir2/dir3").writebytes("egg", data4)
+            src_fs.writebytes("foo", self.data1)
+            src_fs.writebytes("bar", self.data2)
+            src_fs.makedir("dir1").writebytes("baz", self.data3)
+            src_fs.makedirs("dir2/dir3").writebytes("egg", self.data4)
             dst_fs = self.fs
             fs.copy.copy_fs(src_fs, dst_fs, workers=workers)
-            self.assertEqual(dst_fs.readbytes("foo"), data1)
-            self.assertEqual(dst_fs.readbytes("bar"), data2)
-            self.assertEqual(dst_fs.readbytes("dir1/baz"), data3)
-            self.assertEqual(dst_fs.readbytes("dir2/dir3/egg"), data4)
+            self.assertEqual(dst_fs.readbytes("foo"), self.data1)
+            self.assertEqual(dst_fs.readbytes("bar"), self.data2)
+            self.assertEqual(dst_fs.readbytes("dir1/baz"), self.data3)
+            self.assertEqual(dst_fs.readbytes("dir2/dir3/egg"), self.data4)
 
     def test_upload_0(self):
         self._test_upload(0)
@@ -1222,21 +1222,17 @@ def test_upload_4(self):
 
     def _test_download(self, workers):
         """Test fs.copy with varying number of worker threads."""
-        data1 = b"foo" * 256 * 1024
-        data2 = b"bar" * 2 * 256 * 1024
-        data3 = b"baz" * 3 * 256 * 1024
-        data4 = b"egg" * 7 * 256 * 1024
         src_fs = self.fs
         with open_fs("temp://") as dst_fs:
-            src_fs.writebytes("foo", data1)
-            src_fs.writebytes("bar", data2)
-            src_fs.makedir("dir1").writebytes("baz", data3)
-            src_fs.makedirs("dir2/dir3").writebytes("egg", data4)
+            src_fs.writebytes("foo", self.data1)
+            src_fs.writebytes("bar", self.data2)
+            src_fs.makedir("dir1").writebytes("baz", self.data3)
+            src_fs.makedirs("dir2/dir3").writebytes("egg", self.data4)
             fs.copy.copy_fs(src_fs, dst_fs, workers=workers)
-            self.assertEqual(dst_fs.readbytes("foo"), data1)
-            self.assertEqual(dst_fs.readbytes("bar"), data2)
-            self.assertEqual(dst_fs.readbytes("dir1/baz"), data3)
-            self.assertEqual(dst_fs.readbytes("dir2/dir3/egg"), data4)
+            self.assertEqual(dst_fs.readbytes("foo"), self.data1)
+            self.assertEqual(dst_fs.readbytes("bar"), self.data2)
+            self.assertEqual(dst_fs.readbytes("dir1/baz"), self.data3)
+            self.assertEqual(dst_fs.readbytes("dir2/dir3/egg"), self.data4)
 
     def test_download_0(self):
         self._test_download(0)

tests/test_appfs.py

@@ -15,12 +15,13 @@
 from fs import appfs
 
 
-class _TestAppFS(object):
+class _TestAppFS(fs.test.FSTestCases):
 
     AppFS = None
 
     @classmethod
     def setUpClass(cls):
+        super(_TestAppFS, cls).setUpClass()
         cls.tmpdir = tempfile.mkdtemp()
 
     @classmethod
@@ -62,25 +63,25 @@ def test_str(self):
         )
 
 
-class TestUserDataFS(_TestAppFS, fs.test.FSTestCases, unittest.TestCase):
+class TestUserDataFS(_TestAppFS, unittest.TestCase):
     AppFS = appfs.UserDataFS
 
 
-class TestUserConfigFS(_TestAppFS, fs.test.FSTestCases, unittest.TestCase):
+class TestUserConfigFS(_TestAppFS, unittest.TestCase):
     AppFS = appfs.UserConfigFS
 
 
-class TestUserCacheFS(_TestAppFS, fs.test.FSTestCases, unittest.TestCase):
+class TestUserCacheFS(_TestAppFS, unittest.TestCase):
     AppFS = appfs.UserCacheFS
 
 
-class TestSiteDataFS(_TestAppFS, fs.test.FSTestCases, unittest.TestCase):
+class TestSiteDataFS(_TestAppFS, unittest.TestCase):
     AppFS = appfs.SiteDataFS
 
 
-class TestSiteConfigFS(_TestAppFS, fs.test.FSTestCases, unittest.TestCase):
+class TestSiteConfigFS(_TestAppFS, unittest.TestCase):
     AppFS = appfs.SiteConfigFS
 
 
-class TestUserLogFS(_TestAppFS, fs.test.FSTestCases, unittest.TestCase):
+class TestUserLogFS(_TestAppFS, unittest.TestCase):
     AppFS = appfs.UserLogFS