test: create fixtures for async and sync gitlab clients usage

vishes-shell · vishes-shell · commit 090af39fa805 · 2020-02-29T16:41:46.000+03:00
diff --git a/gitlab/tests/conftest.py b/gitlab/tests/conftest.py
@@ -0,0 +1,55 @@
+import asyncio
+
+import pytest
+
+from gitlab import AsyncGitlab, Gitlab
+
+gitlab_kwargs = {
+    "url": "http://localhost",
+    "private_token": "private_token",
+    "api_version": 4,
+}
+
+
+@pytest.fixture(
+    params=[Gitlab(**gitlab_kwargs), AsyncGitlab(**gitlab_kwargs)],
+    ids=["sync", "async"],
+)
+def gl(request):
+    return request.param
+
+
+async def awaiter(v):
+    if asyncio.iscoroutine(v):
+        return await v
+    else:
+        return v
+
+
+async def returner(v):
+    return v
+
+
+@pytest.fixture
+def gl_get_value(gl):
+    """Fixture that returns async function that either return input value or awaits it
+
+    Usage::
+
+        result = gl.http_get()
+        result = await gl_get_value(result)
+    """
+    if isinstance(gl, Gitlab):
+        return returner
+    else:
+        return awaiter
+
+
+@pytest.fixture
+def is_gl_sync(gl):
+    """If gitlab client sync or not
+    """
+    if isinstance(gl, Gitlab):
+        return True
+    else:
+        return False
diff --git a/gitlab/tests/test_gitlab.py b/gitlab/tests/test_gitlab.py
@@ -156,13 +156,10 @@ def test_http_auth(self, gitlab_class):
         assert "Authorization" not in gl.headers
 
 
-@pytest.mark.parametrize(
-    "gl, sync", [(sync_gitlab, True), (async_gitlab, False),],
-)
 class TestGitlabList:
     @respx.mock
     @pytest.mark.asyncio
-    async def test_build_list(self, gl, sync):
+    async def test_build_list(self, gl, gl_get_value, is_gl_sync):
         request_1 = respx.get(
             "http://localhost/api/v4/tests",
             headers={
@@ -193,8 +190,7 @@ async def test_build_list(self, gl, sync):
             status_code=StatusCode.OK,
         )
         obj = gl.http_list("/tests", as_list=False)
-        if not sync:
-            obj = await obj
+        obj = await gl_get_value(obj)
 
         assert len(obj) == 2
         assert obj._next_url == "http://localhost/api/v4/tests?per_page=1&page=2"
@@ -205,18 +201,18 @@ async def test_build_list(self, gl, sync):
         assert obj.total_pages == 2
         assert obj.total == 2
 
-        if not sync:
-            l = await obj.as_list()
-        else:
+        if is_gl_sync:
             l = list(obj)
+        else:
+            l = await obj.as_list()
 
         assert len(l) == 2
         assert l[0]["a"] == "b"
         assert l[1]["c"] == "d"
 
     @respx.mock
     @pytest.mark.asyncio
-    async def test_all_ommited_when_as_list(self, gl, sync):
+    async def test_all_ommited_when_as_list(self, gl, gl_get_value):
         request = respx.get(
             "http://localhost/api/v4/tests",
             headers={
@@ -232,8 +228,7 @@ async def test_all_ommited_when_as_list(self, gl, sync):
         )
 
         result = gl.http_list("/tests", as_list=False, all=True)
-        if not sync:
-            result = await result
+        result = await gl_get_value(result)
 
         assert isinstance(result, GitlabList)
 
