Apply code review feedback

Author: ppolewicz

b2sdk/api.py

@@ -84,6 +84,7 @@ def __init__(
             services=self, max_workers=max_upload_workers
         )
         self.copy_manager = self.COPY_MANAGER_CLASS(services=self, max_workers=max_copy_workers)
+        assert max_download_streams_per_file is None or max_download_streams_per_file >= 1
         self.download_manager = self.DOWNLOAD_MANAGER_CLASS(
             services=self,
             max_workers=max_download_workers,

test/unit/v_all/test_api.py

@@ -22,82 +22,84 @@
 from ..test_base import TestBase
 
 
-class TestServices(TestBase):
-    def setUp(self):
+class DummyA:
+    def __init__(self, *args, **kwargs):
+        pass
+
+
+class DummyB:
+    def __init__(self, *args, **kwargs):
+        pass
+
+
+class TestServices:
+    @pytest.mark.apiver(from_ver=2)
+    @pytest.mark.parametrize(
+        ('kwargs', '_raw_api_class'),
+        [
+            [
+                {
+                    'max_upload_workers': 1,
+                    'max_copy_workers': 2,
+                    'max_download_workers': 3,
+                    'save_to_buffer_size': 4,
+                    'check_download_hash': False,
+                    'max_download_streams_per_file': 5,
+                },
+                DummyA,
+            ],
+            [
+                {
+                    'max_upload_workers': 2,
+                    'max_copy_workers': 3,
+                    'max_download_workers': 4,
+                    'save_to_buffer_size': 5,
+                    'check_download_hash': True,
+                    'max_download_streams_per_file': 6,
+                },
+                DummyB,
+            ],
+        ],
+    )  # yapf: disable
+    def test_api_initialization(self, kwargs, _raw_api_class):
         self.account_info = InMemoryAccountInfo()
         self.cache = InMemoryCache()
 
-    @pytest.mark.apiver(from_ver=2)
-    def test_api_initialization(self):
-        class DummyA:
-            def __init__(self, *args, **kwargs):
-                pass
-
-        class DummyB:
-            def __init__(self, *args, **kwargs):
-                pass
-
-        for kwargs, _raw_api_class in [
-                (
-                    dict(
-                        max_upload_workers = 1,
-                        max_copy_workers = 2,
-                        max_download_workers = 3,
-                        save_to_buffer_size = 4,
-                        check_download_hash = False,
-                        max_download_streams_per_file = 5,
-                    ),
-                    DummyA,
-                ),
-                (
-                    dict(
-                        max_upload_workers = 2,
-                        max_copy_workers = 3,
-                        max_download_workers = 4,
-                        save_to_buffer_size = 5,
-                        check_download_hash = True,
-                        max_download_streams_per_file = 6,
-                    ),
-                    DummyB,
-                )
-            ]:  # yapf: disable
-
-            api_config = B2HttpApiConfig(_raw_api_class=_raw_api_class)
-
-            self.api = B2Api(
-                self.account_info,
-                self.cache,
-                api_config=api_config,
-
-                **kwargs
-            )  # yapf: disable
-
-            assert self.api.account_info is self.account_info
-            assert self.api.api_config is api_config
-            assert self.api.cache is self.cache
-
-            assert self.api.session.account_info is self.account_info
-            assert self.api.session.cache is self.cache
-            assert isinstance(self.api.session.raw_api, _raw_api_class)
-
-            assert isinstance(self.api.file_version_factory, B2Api.FILE_VERSION_FACTORY_CLASS)
-            assert isinstance(
-                self.api.download_version_factory,
-                B2Api.DOWNLOAD_VERSION_FACTORY_CLASS,
-            )
-
-            services = self.api.services
-            assert isinstance(services, B2Api.SERVICES_CLASS)
-
-            # max copy/upload/download workers could only be verified with mocking
-
-            download_manager = services.download_manager
-            assert isinstance(download_manager, services.DOWNLOAD_MANAGER_CLASS)
-
-            assert download_manager.write_buffer_size == kwargs['save_to_buffer_size']
-            assert download_manager.check_hash == kwargs['check_download_hash']
-            assert download_manager.strategies[0].max_streams == kwargs[
-                'max_download_streams_per_file']
+        api_config = B2HttpApiConfig(_raw_api_class=_raw_api_class)
+
+        self.api = B2Api(
+            self.account_info,
+            self.cache,
+            api_config=api_config,
+
+            **kwargs
+        )  # yapf: disable
+
+        assert self.api.account_info is self.account_info
+        assert self.api.api_config is api_config
+        assert self.api.cache is self.cache
+
+        assert self.api.session.account_info is self.account_info
+        assert self.api.session.cache is self.cache
+        assert isinstance(self.api.session.raw_api, _raw_api_class)
+
+        assert isinstance(self.api.file_version_factory, B2Api.FILE_VERSION_FACTORY_CLASS)
+        assert isinstance(
+            self.api.download_version_factory,
+            B2Api.DOWNLOAD_VERSION_FACTORY_CLASS,
+        )
+
+        services = self.api.services
+        assert isinstance(services, B2Api.SERVICES_CLASS)
+
+        # max copy/upload/download workers could only be verified with mocking
+
+        download_manager = services.download_manager
+        assert isinstance(download_manager, services.DOWNLOAD_MANAGER_CLASS)
+
+        assert download_manager.write_buffer_size == kwargs['save_to_buffer_size']
+        assert download_manager.check_hash == kwargs['check_download_hash']
+        assert download_manager.strategies[0].max_streams == kwargs['max_download_streams_per_file']
 
 
 class TestApi(TestBase):