Skip to content

Commit 5583d96

Browse files
committed
add improvements
1 parent 9084cc2 commit 5583d96

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

readthedocs/builds/managers.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,16 @@ def create_latest(self, **kwargs):
7373
return self.create(**defaults)
7474

7575
def get_object_or_log(self, **kwargs):
76+
"""
77+
Returns Version object or log.
78+
79+
It will return the Version object if found for the given kwargs,
80+
otherwise it will log a warning along with all provided kwargs.
81+
"""
7682
try:
77-
return super(VersionManagerBase, self).get(**kwargs)
83+
return super().get(**kwargs)
7884
except ObjectDoesNotExist:
79-
log.warning('Version not found for the pk = {pk}'.format(pk=kwargs.get('pk')))
85+
log.warning('Version not found for given kwargs. %s' % kwargs)
8086

8187

8288
class VersionManager(SettingsOverrideObject):

readthedocs/rtd_tests/tests/test_celery.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,22 +256,22 @@ def public_task_exception():
256256
def test_sync_files_logging_when_wrong_version_pk(self, mock_logger):
257257
self.assertFalse(Version.objects.filter(pk=345343).exists())
258258
tasks.sync_files(project_pk=None, version_pk=345343)
259-
mock_logger.warning.assert_called_with('Version not found for the pk = 345343')
259+
mock_logger.warning.assert_called_with("Version not found for given kwargs. {'pk': 345343}")
260260

261261
@patch('readthedocs.builds.managers.log')
262262
def test_move_files_logging_when_wrong_version_pk(self, mock_logger):
263263
self.assertFalse(Version.objects.filter(pk=345343).exists())
264264
tasks.move_files(version_pk=345343, hostname=None)
265-
mock_logger.warning.assert_called_with('Version not found for the pk = 345343')
265+
mock_logger.warning.assert_called_with("Version not found for given kwargs. {'pk': 345343}")
266266

267267
@patch('readthedocs.builds.managers.log')
268268
def test_update_search_logging_when_wrong_version_pk(self, mock_logger):
269269
self.assertFalse(Version.objects.filter(pk=345343).exists())
270270
tasks.update_search(version_pk=345343, commit=None)
271-
mock_logger.warning.assert_called_with('Version not found for the pk = 345343')
271+
mock_logger.warning.assert_called_with("Version not found for given kwargs. {'pk': 345343}")
272272

273273
@patch('readthedocs.builds.managers.log')
274274
def test_fileify_logging_when_wrong_version_pk(self, mock_logger):
275275
self.assertFalse(Version.objects.filter(pk=345343).exists())
276276
tasks.fileify(version_pk=345343, commit=None)
277-
mock_logger.warning.assert_called_with('Version not found for the pk = 345343')
277+
mock_logger.warning.assert_called_with("Version not found for given kwargs. {'pk': 345343}")

0 commit comments

Comments
 (0)