Fix tests

Author: leshchenko1979

tests/fixtures.py renamed to tests/conftest.py

@@ -5,6 +5,16 @@
 from fast_bitrix24 import Bitrix, BitrixAsync
 
 
+@pytest.fixture(scope='session')
+def bx_dummy_async():
+    return BitrixAsync("https://google.com/path")
+
+
+@pytest.fixture(scope='session')
+def bx_dummy():
+    return Bitrix("https://google.com/path")
+
+
 @pytest.fixture(scope='session')
 def get_test():
     test_webhook = os.getenv('FAST_BITRIX24_TEST_WEBHOOK')

tests/test_async.py

@@ -8,14 +8,6 @@
 from fast_bitrix24 import BitrixAsync
 from fast_bitrix24.srh import BITRIX_POOL_SIZE, BITRIX_RPS, ServerRequestHandler
 
-from .fixtures import (
-    create_100_leads,
-    create_100_leads_async,
-    create_a_lead,
-    get_test,
-    get_test_async,
-)
-
 
 @pytest.mark.skipif(
     not os.getenv("FAST_BITRIX24_TEST_WEBHOOK"),

tests/test_helpers.py

@@ -1,22 +1,6 @@
-from fast_bitrix24.server_response import ServerResponseParser
 from fast_bitrix24.utils import http_build_query
 
 
-def test_server_response():
-    RAW = {
-        "result": 25,
-        "time": {
-            "start": 1649929692.302662,
-            "finish": 1649929692.547846,
-            "duration": 0.24518418312072754,
-            "processing": 0.14425015449523926,
-            "date_start": "2022-04-14T12:48:12+03:00",
-            "date_finish": "2022-04-14T12:48:12+03:00",
-        },
-    }
-    assert ServerResponseParser(RAW).result == 25
-
-
 class TestHttpBuildQuery:
     def test_original(self):
         assert http_build_query({"alpha": "bravo"}) == "alpha=bravo&"

tests/test_server_responses.py

@@ -2,19 +2,13 @@
 
 import pytest
 from beartype.typing import Dict, List, Union
-from fast_bitrix24.bitrix import BitrixAsync
 from fast_bitrix24.logger import logger
 from fast_bitrix24.server_response import ServerResponseParser
 from fast_bitrix24.srh import ServerRequestHandler
 
 logger.addHandler(logging.StreamHandler())
 
 
-@pytest.fixture
-def bitrix():
-    return BitrixAsync("https://google.com/path")
-
-
 class MockSRH(ServerRequestHandler):
     def __init__(self, response: Union[Dict, List[Dict]]):
         self.response = response if isinstance(response, list) else [response]
@@ -39,43 +33,35 @@ def test_single_success():
     assert isinstance(results, list)
 
 
-@pytest.mark.asyncio
-async def test_batch_success(bitrix):
-    from tests.real_responses.crm_lead_list_several_pages_success import \
-        response
+def test_batch_success(bx_dummy):
+    from tests.real_responses.crm_lead_list_several_pages_success import response
 
-    bitrix.srh = MockSRH(response)
-    results = await bitrix.get_all("crm.lead.list")
+    bx_dummy.srh = MockSRH(response)
+    results = bx_dummy.get_all("crm.lead.list")
     assert isinstance(results, list)
 
 
-@pytest.mark.asyncio
-async def test_batch_single_page_error(bitrix):
-    from tests.real_responses.crm_get_batch_mix_success_and_errors import \
-        response
+def test_batch_single_page_error(bx_dummy):
+    from tests.real_responses.crm_get_batch_mix_success_and_errors import response
 
-    bitrix.srh = MockSRH(response)
+    bx_dummy.srh = MockSRH(response)
     with pytest.raises(RuntimeError):
-        await bitrix.get_by_ID("crm.lead.get", [0, 1, 35943])
+        bx_dummy.get_by_ID("crm.lead.get", [0, 1, 35943])
 
 
-@pytest.mark.asyncio
-async def test_call_single_success(bitrix):
+def test_call_single_success(bx_dummy):
     from tests.real_responses.call_single_success import response
 
-    bitrix.srh = MockSRH(response)
-    results = await bitrix.call("crm.lead.get", {"ID": 35943})
+    bx_dummy.srh = MockSRH(response)
+    results = bx_dummy.call("crm.lead.get", {"ID": 35943})
     assert isinstance(results, dict)
 
 
-@pytest.mark.asyncio
-async def test_call_several_success(bitrix):
+def test_call_several_success(bx_dummy):
     from tests.real_responses.call_several_success import response
 
-    bitrix.srh = MockSRH(response)
-    results = await bitrix.call(
-        "crm.lead.get", [{"ID": 35943}, {"ID": 161}, {"ID": 171}]
-    )
+    bx_dummy.srh = MockSRH(response)
+    results = bx_dummy.call("crm.lead.get", [{"ID": 35943}, {"ID": 161}, {"ID": 171}])
     assert isinstance(results, tuple)
     assert len(results) == 3
     assert isinstance(results[0], dict)

tests/test_sync.py

@@ -1,22 +1,7 @@
 import os
 
-from icontract import ViolationError
 import pytest
 
-from .fixtures import (
-    create_100_leads,
-    create_100_leads_async,
-    create_a_lead,
-    get_test,
-    get_test_async,
-    create_a_deal,
-    create_100_tasks,
-)
-
-from fast_bitrix24 import Bitrix
-from fast_bitrix24.server_response import ServerResponseParser
-
-
 @pytest.mark.skipif(
     not os.getenv("FAST_BITRIX24_TEST_WEBHOOK"),
     reason="Нет аккаунта, на котором можно проверить",
@@ -159,8 +144,8 @@ def test_case(self, get_test):
 
 
 class TestErrors:
-    def test_get_all(self, get_test):
-        b = get_test
+    def test_get_all(self, bx_dummy):
+        b = bx_dummy
 
         with pytest.raises(Exception):
             b.get_all("")
@@ -174,17 +159,17 @@ def test_get_all(self, get_test):
         with pytest.raises(Exception):
             b.get_all("some_method", {"filter": 3})
 
-    def test_get_by_ID(self, get_test):
-        b = get_test
+    def test_get_by_ID(self, bx_dummy):
+        b = bx_dummy
 
         with pytest.raises(Exception):
             b.get_by_ID("_", 123)
 
         with pytest.raises(Exception):
             b.get_by_ID("_", [["a"]])
 
-    def test_call(self, get_test, monkeypatch):
-        b = get_test
+    def test_call(self, bx_dummy, monkeypatch):
+        b = bx_dummy
 
         async def stub(*args, **kwargs):
             return {"result": "ok"}