Merge pull request #315 from Backblaze/speedup-unittests

Speed up unit tests

Author: ppolewicz

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Introduce a common thread worker pool for all downloads
 * Increase http timeout to 20min (for copy using 5GB parts)
 * Remove inheritance from object (leftover from python2)
+* Run unit tests on all CPUs
 
 ### Added
 * Add pypy-3.8 to test matrix

noxfile.py

@@ -31,6 +31,7 @@
     "pytest-mock==3.6.1",
     'pytest-lazy-fixture==0.6.3',
     'pyfakefs==4.5.6',
+    'pytest-xdist==2.5.0',
 ]
 REQUIREMENTS_BUILD = ['setuptools>=20.2']
 
@@ -108,7 +109,7 @@ def unit(session):
     """Run unit tests."""
     install_myself(session)
     session.install(*REQUIREMENTS_TEST)
-    args = ['--doctest-modules', '-p', 'pyfakefs']
+    args = ['--doctest-modules', '-p', 'pyfakefs', '-n', 'auto']
     if not SKIP_COVERAGE:
         args += ['--cov=b2sdk', '--cov-branch', '--cov-report=xml']
     # TODO: Use session.parametrize for apiver

test/unit/bucket/test_bucket.py

@@ -1167,9 +1167,8 @@ def test_upload_local_large_file(self):
             self.bucket.upload_local_file(path, 'file1')
             self._check_file_contents('file1', data)
 
-    def test_upload_local_large_file_over_10k_parts(
-        self
-    ):  # TODO: this test is very slow, speed it up?
+    def test_upload_local_large_file_over_10k_parts(self):
+        pytest.skip('this test is really slow and impedes development')  # TODO: fix it
         with TempDir() as d:
             path = os.path.join(d, 'file1')
             data = self._make_data(self.simulator.MIN_PART_SIZE * 10001)  # 2MB on the simulator

test/unit/internal/test_emerge_planner.py

@@ -94,7 +94,10 @@ def setUp(self):
         self.recommended_size = 100 * MEGABYTE
         self.min_size = 5 * MEGABYTE
         self.max_size = 5 * GIGABYTE
-        self.planner = EmergePlanner(
+        self.planner = self._get_emerge_planner()
+
+    def _get_emerge_planner(self):
+        return EmergePlanner(
             min_part_size=self.min_size,
             recommended_upload_part_size=self.recommended_size,
             max_part_size=self.max_size,
@@ -148,6 +151,15 @@ def test_single_multipart_upload(self):
             self.split_source_to_part_defs(source, expected_part_sizes),
         )
 
+    def test_recommended_part_size_decrease(self):
+        source_upload1 = UploadSource(self.recommended_size * 10001)
+
+        write_intents = [
+            WriteIntent(source_upload1),
+        ]
+        emerge_plan = self.planner.get_emerge_plan(write_intents)
+        assert len(emerge_plan.emerge_parts) < 10000
+
     def test_single_multipart_copy(self):
         source = CopySource(5 * self.max_size)