Skip to content

Commit

Permalink
fix test and quotes
Browse files Browse the repository at this point in the history
  • Loading branch information
pierre-24 committed Jan 21, 2017
1 parent 01c5890 commit a5b632e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion zds/notification/tests/tests_tricky.py
Expand Up @@ -71,7 +71,7 @@ def test_no_dead_notif_on_moving(self):
overrided_zds_app = settings.ZDS_APP
overrided_zds_app['content']['repo_private_path'] = os.path.join(BASE_DIR, 'contents-private-test')
overrided_zds_app['content']['repo_public_path'] = os.path.join(BASE_DIR, 'contents-public-test')
overrided_zds_app['content']['extra_content_generation_policy'] = "SYNC"
overrided_zds_app['content']['extra_content_generation_policy'] = 'SYNC'


@override_settings(MEDIA_ROOT=os.path.join(BASE_DIR, 'media-test'))
Expand Down
6 changes: 5 additions & 1 deletion zds/searchv2/tests/tests_models.py
Expand Up @@ -215,9 +215,13 @@ def test_indexation(self):
self.assertTrue(post.pk not in [p.pk for p in Post.get_es_indexable(force_reindexing=False)])
self.assertTrue(new_post.pk in [p.pk for p in Post.get_es_indexable(force_reindexing=False)])

published.es_flagged = True # Since force reindexation delete the chapter, let's reindex the content
published.save()
self.manager.refresh_index()

for model in self.indexable[1:]: # ok, so let's index that
self.manager.es_bulk_indexing_of_model(model, force_reindexing=False)
self.manager.refresh_index()
self.manager.refresh_index()

s = Search()
s.query(MatchAll())
Expand Down
4 changes: 2 additions & 2 deletions zds/utils/templatetags/date.py
Expand Up @@ -77,8 +77,8 @@ def humane_time(timestamp):
@register.filter
def from_elasticsearch_date(value):
try:
date = datetime.strptime(value, "%Y-%m-%dT%H:%M:%S.%f")
date = datetime.strptime(value, '%Y-%m-%dT%H:%M:%S.%f')
except ValueError:
date = datetime.strptime(value, "%Y-%m-%dT%H:%M:%S")
date = datetime.strptime(value, '%Y-%m-%dT%H:%M:%S')

return date

0 comments on commit a5b632e

Please sign in to comment.