summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gitlab/tests/test_gitlab.py11
-rw-r--r--gitlab/tests/test_mixins.py4
2 files changed, 10 insertions, 5 deletions
diff --git a/gitlab/tests/test_gitlab.py b/gitlab/tests/test_gitlab.py
index d642eaf..6bc427d 100644
--- a/gitlab/tests/test_gitlab.py
+++ b/gitlab/tests/test_gitlab.py
@@ -205,7 +205,7 @@ class TestGitlabList(unittest.TestCase):
return response(200, content, headers, None, 5, request)
with HTTMock(resp_1):
- obj = self.gl.http_list('/tests')
+ 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')
@@ -311,7 +311,12 @@ class TestGitlabHttpMethods(unittest.TestCase):
return response(200, content, headers, None, 5, request)
with HTTMock(resp_cont):
- result = self.gl.http_list('/projects')
+ result = self.gl.http_list('/projects', as_list=True)
+ self.assertIsInstance(result, list)
+ self.assertEqual(len(result), 1)
+
+ with HTTMock(resp_cont):
+ result = self.gl.http_list('/projects', as_list=False)
self.assertIsInstance(result, GitlabList)
self.assertEqual(len(result), 1)
@@ -324,7 +329,7 @@ class TestGitlabHttpMethods(unittest.TestCase):
@urlmatch(scheme="http", netloc="localhost",
path="/api/v4/not_there", method="get")
def resp_cont(url, request):
- content = {'Here is wh it failed'}
+ content = {'Here is why it failed'}
return response(404, content, {}, None, 5, request)
with HTTMock(resp_cont):
diff --git a/gitlab/tests/test_mixins.py b/gitlab/tests/test_mixins.py
index de853d7..812a118 100644
--- a/gitlab/tests/test_mixins.py
+++ b/gitlab/tests/test_mixins.py
@@ -178,7 +178,7 @@ class TestMixinMethods(unittest.TestCase):
with HTTMock(resp_cont):
# test RESTObjectList
mgr = M(self.gl)
- obj_list = mgr.list()
+ obj_list = mgr.list(as_list=False)
self.assertIsInstance(obj_list, base.RESTObjectList)
for obj in obj_list:
self.assertIsInstance(obj, FakeObject)
@@ -205,7 +205,7 @@ class TestMixinMethods(unittest.TestCase):
with HTTMock(resp_cont):
mgr = M(self.gl)
- obj_list = mgr.list(path='/others')
+ obj_list = mgr.list(path='/others', as_list=False)
self.assertIsInstance(obj_list, base.RESTObjectList)
obj = obj_list.next()
self.assertEqual(obj.id, 42)