EbookFoundation
/
readthedocs.org
mirror of https://github.com/EbookFoundation/readthedocs.org.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add improvements

ghowardsit
dojutsu-user 2019-01-22 23:26:35 +05:30
parent 9084cc2598
commit 5583d96015
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
readthedocs/builds/managers.py
View File

@ -73,10 +73,16 @@ class VersionManagerBase(models.Manager):
return self.create(**defaults)
def get_object_or_log(self, **kwargs):
"""
Returns Version object or log.
It will return the Version object if found for the given kwargs,
otherwise it will log a warning along with all provided kwargs.
"""
try:
return super(VersionManagerBase, self).get(**kwargs)
return super().get(**kwargs)
except ObjectDoesNotExist:
log.warning('Version not found for the pk = {pk}'.format(pk=kwargs.get('pk')))
log.warning('Version not found for given kwargs. %s' % kwargs)
class VersionManager(SettingsOverrideObject):

8
readthedocs/rtd_tests/tests/test_celery.py
View File

@ -256,22 +256,22 @@ class TestCeleryBuilding(RTDTestCase):
def test_sync_files_logging_when_wrong_version_pk(self, mock_logger):
self.assertFalse(Version.objects.filter(pk=345343).exists())
tasks.sync_files(project_pk=None, version_pk=345343)
mock_logger.warning.assert_called_with('Version not found for the pk = 345343')
mock_logger.warning.assert_called_with("Version not found for given kwargs. {'pk': 345343}")
@patch('readthedocs.builds.managers.log')
def test_move_files_logging_when_wrong_version_pk(self, mock_logger):
self.assertFalse(Version.objects.filter(pk=345343).exists())
tasks.move_files(version_pk=345343, hostname=None)
mock_logger.warning.assert_called_with('Version not found for the pk = 345343')
mock_logger.warning.assert_called_with("Version not found for given kwargs. {'pk': 345343}")
@patch('readthedocs.builds.managers.log')
def test_update_search_logging_when_wrong_version_pk(self, mock_logger):
self.assertFalse(Version.objects.filter(pk=345343).exists())
tasks.update_search(version_pk=345343, commit=None)
mock_logger.warning.assert_called_with('Version not found for the pk = 345343')
mock_logger.warning.assert_called_with("Version not found for given kwargs. {'pk': 345343}")
@patch('readthedocs.builds.managers.log')
def test_fileify_logging_when_wrong_version_pk(self, mock_logger):
self.assertFalse(Version.objects.filter(pk=345343).exists())
tasks.fileify(version_pk=345343, commit=None)
mock_logger.warning.assert_called_with('Version not found for the pk = 345343')
mock_logger.warning.assert_called_with("Version not found for given kwargs. {'pk': 345343}")