test: add pytest test dependency and remove sync TestGitlabList

vishes-shell · vishes-shell · commit 3b90d0905936 · 2020-02-22T15:36:28.000+03:00
diff --git a/gitlab/tests/test_async_gitlab.py b/gitlab/tests/test_async_gitlab.py
@@ -1,6 +1,5 @@
 import pytest
 import respx
-from httpx import status_codes
 from httpx.status_codes import StatusCode
 
 from gitlab import Gitlab, GitlabList
diff --git a/gitlab/tests/test_gitlab.py b/gitlab/tests/test_gitlab.py
@@ -16,22 +16,21 @@
 # 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/>.
 
+import json
 import os
 import pickle
 import tempfile
-import json
 import unittest
 
+import requests
 from httmock import HTTMock  # noqa
 from httmock import response  # noqa
 from httmock import urlmatch  # noqa
-import requests
 
 import gitlab
 from gitlab import *  # noqa
 from gitlab.v4.objects import *  # noqa
 
-
 valid_config = b"""[global]
 default = one
 ssl_verify = true
@@ -58,86 +57,6 @@ def test_dict(self):
         self.assertEqual(expected, gitlab._sanitize(source))
 
 
-class TestGitlabList(unittest.TestCase):
-    def setUp(self):
-        self.gl = Gitlab(
-            "http://localhost", private_token="private_token", api_version=4
-        )
-
-    def test_build_list(self):
-        @urlmatch(scheme="http", netloc="localhost", path="/api/v4/tests", method="get")
-        def resp_1(url, request):
-            headers = {
-                "content-type": "application/json",
-                "X-Page": 1,
-                "X-Next-Page": 2,
-                "X-Per-Page": 1,
-                "X-Total-Pages": 2,
-                "X-Total": 2,
-                "Link": (
-                    "<http://localhost/api/v4/tests?per_page=1&page=2>;" ' rel="next"'
-                ),
-            }
-            content = '[{"a": "b"}]'
-            return response(200, content, headers, None, 5, request)
-
-        @urlmatch(
-            scheme="http",
-            netloc="localhost",
-            path="/api/v4/tests",
-            method="get",
-            query=r".*page=2",
-        )
-        def resp_2(url, request):
-            headers = {
-                "content-type": "application/json",
-                "X-Page": 2,
-                "X-Next-Page": 2,
-                "X-Per-Page": 1,
-                "X-Total-Pages": 2,
-                "X-Total": 2,
-            }
-            content = '[{"c": "d"}]'
-            return response(200, content, headers, None, 5, request)
-
-        with HTTMock(resp_1):
-            obj = self.gl.http_list("/tests", as_list=False)
-            self.assertEqual(len(obj), 2)
-            self.assertEqual(
-                obj._next_url, "http://localhost/api/v4/tests?per_page=1&page=2"
-            )
-            self.assertEqual(obj.current_page, 1)
-            self.assertEqual(obj.prev_page, None)
-            self.assertEqual(obj.next_page, 2)
-            self.assertEqual(obj.per_page, 1)
-            self.assertEqual(obj.total_pages, 2)
-            self.assertEqual(obj.total, 2)
-
-            with HTTMock(resp_2):
-                l = list(obj)
-                self.assertEqual(len(l), 2)
-                self.assertEqual(l[0]["a"], "b")
-                self.assertEqual(l[1]["c"], "d")
-
-    def test_all_omitted_when_as_list(self):
-        @urlmatch(scheme="http", netloc="localhost", path="/api/v4/tests", method="get")
-        def resp(url, request):
-            headers = {
-                "content-type": "application/json",
-                "X-Page": 2,
-                "X-Next-Page": 2,
-                "X-Per-Page": 1,
-                "X-Total-Pages": 2,
-                "X-Total": 2,
-            }
-            content = '[{"c": "d"}]'
-            return response(200, content, headers, None, 5, request)
-
-        with HTTMock(resp):
-            result = self.gl.http_list("/tests", as_list=False, all=True)
-            self.assertIsInstance(result, GitlabList)
-
-
 class TestGitlabHttpMethods(unittest.TestCase):
     def setUp(self):
         self.gl = Gitlab(
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -9,3 +9,4 @@ sphinx>=1.3
 sphinx_rtd_theme
 requests>=2.22.0
 respx>=0.10.0,<0.11
+pytest
