Commit585e3a8

Helen Koike

authored and

JohnVillalovos

committed

fix(client): regression - do not automatically get_next if page=# and

iterator=True/as_list=False are usedThis fix a regression introduced on commit1339d64If page is used, then get_next should be false.This was found on the mesa ci project, after upgrading the python-gitlabversion, the script that monitors the ci was getting killed by consumingtoo much memory.

1 parent3c7c7fc commit585e3a8Copy full SHA for 585e3a8

File tree

3 files changed

+16

-1

lines changed

docs
- api-usage.rst
gitlab
- client.py
tests/unit
- test_gitlab_http_methods.py

3 files changed

+16

-1

lines changed

`‎docs/api-usage.rst`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -393,6 +393,9 @@ The generator exposes extra listing information as received from the server:`
`393`	`393`	Prior to python-gitlab 3.6.0 the argument ``as_list`` was used instead of
`394`	`394`	``iterator``. ``as_list=False`` is the equivalent of ``iterator=True``.
`395`	`395`
	`396`	`+..note::`
	`397`	+ If ``page`` and ``iterator=True`` are used together, the latter is ignored.
	`398`	`+`
`396`	`399`	`Sudo`
`397`	`400`	`====`
`398`	`401`

`‎gitlab/client.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -929,7 +929,7 @@ def http_list(`
`929`	`929`
`930`	`930`	`page=kwargs.get("page")`
`931`	`931`
`932`		`-ifiterator:`
	`932`	`+ifiteratorandpageisNone:`
`933`	`933`	`# Generator requested`
`934`	`934`	`returnGitlabList(self,url,query_data,**kwargs)`
`935`	`935`

`‎tests/unit/test_gitlab_http_methods.py`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -542,6 +542,18 @@ def test_list_request(gl):`
`542`	`542`	`assertresponses.assert_call_count(url,3)isTrue`
`543`	`543`
`544`	`544`
	`545`	`+@responses.activate`
	`546`	`+deftest_list_request_page_and_iterator(gl):`
	`547`	`+response_dict=copy.deepcopy(large_list_response)`
	`548`	`+response_dict["match"]= [responses.matchers.query_param_matcher({"page":"1"})]`
	`549`	`+responses.add(**response_dict)`
	`550`	`+`
	`551`	`+result=gl.http_list("/projects",iterator=True,page=1)`
	`552`	`+assertisinstance(result,list)`
	`553`	`+assertlen(result)==20`
	`554`	`+assertlen(responses.calls)==1`
	`555`	`+`
	`556`	`+`
`545`	`557`	`large_list_response= {`
`546`	`558`	`"method":responses.GET,`
`547`	`559`	`"url":"http://localhost/api/v4/projects",`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit585e3a8

File tree

3 files changed

3 files changed

`‎docs/api-usage.rst`

`‎gitlab/client.py`

`‎tests/unit/test_gitlab_http_methods.py`

0 commit comments