test: fix all tests that are async

vishes-shell · vishes-shell · commit 34666c745c0b · 2020-02-28T23:42:12.000+03:00
diff --git a/gitlab/client.py b/gitlab/client.py
@@ -26,7 +26,7 @@
 import gitlab.config
 from gitlab import exceptions as exc
 from gitlab import utils
-from gitlab.exceptions import on_http_error
+from gitlab.exceptions import GitlabHttpError, GitlabParsingError, on_http_error
 from gitlab.types import GitlabList
 
 REDIRECT_MSG = (
diff --git a/gitlab/tests/objects/test_async_application.py b/gitlab/tests/objects/test_async_application.py
@@ -4,13 +4,13 @@
 import respx
 from httpx.status_codes import StatusCode
 
-from gitlab import Gitlab
+from gitlab import AsyncGitlab
 
 
 class TestApplicationAppearance:
     @pytest.fixture
     def gl(self):
-        return Gitlab(
+        return AsyncGitlab(
             "http://localhost",
             private_token="private_token",
             ssl_verify=True,
diff --git a/gitlab/tests/objects/test_async_projects.py b/gitlab/tests/objects/test_async_projects.py
@@ -2,13 +2,13 @@
 import respx
 from httpx.status_codes import StatusCode
 
-from gitlab import Gitlab
+from gitlab import AsyncGitlab
 
 
 class TestProjectSnippets:
     @pytest.fixture
     def gl(self):
-        return Gitlab(
+        return AsyncGitlab(
             "http://localhost",
             private_token="private_token",
             ssl_verify=True,
@@ -34,7 +34,7 @@ async def test_list_project_snippets(self, gl):
             status_code=StatusCode.OK,
         )
 
-        project = await gl.projects.get(1, lazy=True)
+        project = gl.projects.get(1, lazy=True)
         snippets = await project.snippets.list()
         assert len(snippets) == 1
         assert snippets[0].title == title
@@ -57,7 +57,7 @@ async def test_get_project_snippet(self, gl):
             status_code=StatusCode.OK,
         )
 
-        project = await gl.projects.get(1, lazy=True)
+        project = gl.projects.get(1, lazy=True)
         snippet = await project.snippets.get(1)
         assert snippet.title == title
         assert snippet.visibility == visibility
@@ -92,7 +92,7 @@ async def test_create_update_project_snippets(self, gl):
             status_code=StatusCode.OK,
         )
 
-        project = await gl.projects.get(1, lazy=True)
+        project = gl.projects.get(1, lazy=True)
         snippet = await project.snippets.create(
             {
                 "title": title,
diff --git a/gitlab/tests/test_async_gitlab.py b/gitlab/tests/test_async_gitlab.py
@@ -7,8 +7,9 @@
 import respx
 from httpx.status_codes import StatusCode
 
-from gitlab import Gitlab, GitlabList
+from gitlab import AsyncGitlab
 from gitlab import exceptions as exc
+from gitlab.types import GitlabList
 from gitlab.v4.objects import (
     CurrentUser,
     Group,
@@ -26,7 +27,9 @@
 class TestGitlabList:
     @pytest.fixture
     def gl(self):
-        return Gitlab("http://localhost", private_token="private_token", api_version=4)
+        return AsyncGitlab(
+            "http://localhost", private_token="private_token", api_version=4
+        )
 
     @respx.mock
     @pytest.mark.asyncio
@@ -100,7 +103,9 @@ async def test_all_ommited_when_as_list(self, gl):
 class TestGitlabHttpMethods:
     @pytest.fixture
     def gl(self):
-        return Gitlab("http://localhost", private_token="private_token", api_version=4)
+        return AsyncGitlab(
+            "http://localhost", private_token="private_token", api_version=4
+        )
 
     @respx.mock
     @pytest.mark.asyncio
@@ -263,7 +268,7 @@ async def test_delete_request_404(self, gl):
 class TestGitlab:
     @pytest.fixture
     def gl(self):
-        return Gitlab(
+        return AsyncGitlab(
             "http://localhost",
             private_token="private_token",
             ssl_verify=True,
@@ -517,7 +522,7 @@ async def test_deployment(self, gl):
             status_code=StatusCode.OK,
         )
 
-        project = await gl.projects.get(1, lazy=True)
+        project = gl.projects.get(1, lazy=True)
         deployment = await project.deployments.create(
             {
                 "environment": "Test",
@@ -558,7 +563,7 @@ async def test_user_activate_deactivate(self, gl):
             status_code=StatusCode.CREATED,
         )
 
-        user = await gl.users.get(1, lazy=True)
+        user = gl.users.get(1, lazy=True)
         await user.activate()
         await user.deactivate()
 
diff --git a/gitlab/tests/test_async_mixins.py b/gitlab/tests/test_async_mixins.py
@@ -2,7 +2,7 @@
 import respx
 from httpx.status_codes import StatusCode
 
-from gitlab import Gitlab
+from gitlab import AsyncGitlab
 from gitlab.base import RESTObject, RESTObjectList
 from gitlab.mixins import (
     CreateMixin,
@@ -22,7 +22,9 @@
 class TestMixinMethods:
     @pytest.fixture
     def gl(self):
-        return Gitlab("http://localhost", private_token="private_token", api_version=4)
+        return AsyncGitlab(
+            "http://localhost", private_token="private_token", api_version=4
+        )
 
     @respx.mock
     @pytest.mark.asyncio
@@ -123,11 +125,11 @@ class M(ListMixin, FakeManager):
         mgr = M(gl)
         obj_list = await mgr.list(path="/others", as_list=False)
         assert isinstance(obj_list, RESTObjectList)
-        obj = await obj_list.next()
+        obj = await obj_list.anext()
         assert obj.id == 42
         assert obj.foo == "bar"
         with pytest.raises(StopAsyncIteration):
-            await obj_list.next()
+            await obj_list.anext()
 
     @respx.mock
     @pytest.mark.asyncio
diff --git a/gitlab/tests/test_gitlab.py b/gitlab/tests/test_gitlab.py
@@ -29,6 +29,7 @@
 
 import gitlab
 from gitlab import *  # noqa
+from gitlab.client import _sanitize
 from gitlab.v4.objects import *  # noqa
 
 valid_config = b"""[global]
@@ -44,17 +45,17 @@
 
 class TestSanitize(unittest.TestCase):
     def test_do_nothing(self):
-        self.assertEqual(1, gitlab._sanitize(1))
-        self.assertEqual(1.5, gitlab._sanitize(1.5))
-        self.assertEqual("foo", gitlab._sanitize("foo"))
+        self.assertEqual(1, _sanitize(1))
+        self.assertEqual(1.5, _sanitize(1.5))
+        self.assertEqual("foo", _sanitize("foo"))
 
     def test_slash(self):
-        self.assertEqual("foo%2Fbar", gitlab._sanitize("foo/bar"))
+        self.assertEqual("foo%2Fbar", _sanitize("foo/bar"))
 
     def test_dict(self):
         source = {"url": "foo/bar", "id": 1}
         expected = {"url": "foo%2Fbar", "id": 1}
-        self.assertEqual(expected, gitlab._sanitize(source))
+        self.assertEqual(expected, _sanitize(source))
 
 
 class TestGitlabHttpMethods(unittest.TestCase):
diff --git a/gitlab/types.py b/gitlab/types.py
@@ -15,6 +15,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from .exceptions import GitlabParsingError
+
 
 class GitlabAttribute:
     def __init__(self, value=None):
@@ -56,53 +58,6 @@ def get_file_name(self, attr_name=None):
         return "%s.png" % attr_name if attr_name else "image.png"
 
 
-class GitlabList:
-    """Generator representing a list of remote objects.
-
-    The object handles the links returned by a query to the API, and will call
-    the API again when needed.
-    """
-
-    @property
-    def current_page(self):
-        """The current page number."""
-        return int(self._current_page)
-
-    @property
-    def prev_page(self):
-        """The next page number.
-
-        If None, the current page is the last.
-        """
-        return int(self._prev_page) if self._prev_page else None
-
-    @property
-    def next_page(self):
-        """The next page number.
-
-        If None, the current page is the last.
-        """
-        return int(self._next_page) if self._next_page else None
-
-    @property
-    def per_page(self):
-        """The number of items per page."""
-        return int(self._per_page)
-
-    @property
-    def total_pages(self):
-        """The total number of pages."""
-        return int(self._total_pages)
-
-    @property
-    def total(self):
-        """The total number of items."""
-        return int(self._total)
-
-    def __len__(self):
-        return int(self._total)
-
-
 class GitlabList:
     """Generator representing a list of remote objects.
 
@@ -162,6 +117,45 @@ def _query(self, url, query_data=None, **kwargs):
         result = self._gl.http_request("get", url, query_data=query_data, **kwargs)
         return self._process_query_result(result)
 
+    @property
+    def current_page(self):
+        """The current page number."""
+        return int(self._current_page)
+
+    @property
+    def prev_page(self):
+        """The next page number.
+
+        If None, the current page is the last.
+        """
+        return int(self._prev_page) if self._prev_page else None
+
+    @property
+    def next_page(self):
+        """The next page number.
+
+        If None, the current page is the last.
+        """
+        return int(self._next_page) if self._next_page else None
+
+    @property
+    def per_page(self):
+        """The number of items per page."""
+        return int(self._per_page)
+
+    @property
+    def total_pages(self):
+        """The total number of pages."""
+        return int(self._total_pages)
+
+    @property
+    def total(self):
+        """The total number of items."""
+        return int(self._total)
+
+    def __len__(self):
+        return int(self._total)
+
     def __iter__(self):
         return self
 
