Skip to content

[6.16.z] Add missing timeout when calling entity with timeout #1321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sambible merged 1 commit into from
Jul 9, 2025
Merged

[6.16.z] Add missing timeout when calling entity with timeout #1321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nailgun/entities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6367,7 +6367,7 @@ def sync(self, synchronous=True, timeout=None, **kwargs):
kwargs = kwargs.copy() # shadow the passed-in kwargs
kwargs.update(self._server_config.get_client_kwargs())
response = client.post(self.path('sync'), **kwargs)
return _handle_response(response, self._server_config, synchronous, timeout)
return _handle_response(response, self._server_config, synchronous, timeout=timeout)


class ProductBulkAction(Entity):
Expand Down
2 changes: 1 addition & 1 deletion nailgun/entity_mixins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def call_entity_method_with_timeout(entity_callable, timeout=300, **kwargs):
original_task_timeout = TASK_TIMEOUT
TASK_TIMEOUT = timeout
try:
entity_callable(**kwargs)
entity_callable(timeout=timeout, **kwargs)
finally:
TASK_TIMEOUT = original_task_timeout

Expand Down
Loading