Resolved code formatting change requests

This commit is contained in:
ReAnzu 2018-03-07 19:00:44 -06:00
parent addd2afdaa
commit 4dcbfbdc33
6 changed files with 26 additions and 23 deletions

View file

@ -21,7 +21,7 @@ test_database: 'sqlite:///:memory:' # required for running the test suite
# Delete thumbnails and source files on post delete
# Original functionality is false, to mitigate the impacts of admins going
# Original functionality is no, to mitigate the impacts of admins going
# on unchecked post purges.
delete_source_files: no

View file

@ -399,7 +399,7 @@ def _after_post_update(
def _before_post_delete(
_mapper: Any, _connection: Any, post: model.Post) -> None:
if post.post_id:
image_hash.delete_image(str(post.post_id))
image_hash.delete_image(post.post_id)
if config.config['delete_source_files']:
files.delete(get_post_content_path(post))
files.delete(get_post_thumbnail_path(post))

View file

@ -8,10 +8,14 @@ from szurubooru.func import posts, snapshots
@pytest.fixture(autouse=True)
def inject_config(config_injector):
config_injector({'secret': 'secret',
config_injector({
'secret': 'secret',
'data_dir': '',
'delete_source_files': False,
'privileges': {'posts:delete': model.User.RANK_REGULAR}})
'privileges': {
'posts:delete': model.User.RANK_REGULAR
}
})
def test_deleting(user_factory, post_factory, context_factory):

View file

@ -1,9 +1,7 @@
from datetime import datetime
from unittest.mock import patch
import os
import pytest
from szurubooru import db, model
from szurubooru.func import (
posts, users, comments, tags, images, files, util, image_hash)
@ -843,8 +841,8 @@ def test_merge_posts_moves_child_relations(post_factory, config_injector):
assert posts.get_post_by_id(target_post.post_id).relation_count == 1
def test_merge_posts_doesnt_duplicate_child_relations(post_factory,
config_injector):
def test_merge_posts_doesnt_duplicate_child_relations(
post_factory, config_injector):
config_injector({'delete_source_files': False})
source_post = post_factory()
target_post = post_factory()
@ -879,8 +877,8 @@ def test_merge_posts_moves_parent_relations(post_factory, config_injector):
assert posts.get_post_by_id(related_post.post_id).relation_count == 1
def test_merge_posts_doesnt_duplicate_parent_relations(post_factory,
config_injector):
def test_merge_posts_doesnt_duplicate_parent_relations(
post_factory, config_injector):
config_injector({'delete_source_files': False})
source_post = post_factory()
target_post = post_factory()
@ -898,8 +896,8 @@ def test_merge_posts_doesnt_duplicate_parent_relations(post_factory,
assert posts.get_post_by_id(related_post.post_id).relation_count == 1
def test_merge_posts_doesnt_create_relation_loop_for_children(post_factory,
config_injector):
def test_merge_posts_doesnt_create_relation_loop_for_children(
post_factory, config_injector):
config_injector({'delete_source_files': False})
source_post = post_factory()
target_post = post_factory()

View file

@ -1,15 +1,15 @@
from datetime import datetime
import pytest
from szurubooru import db, model
@pytest.fixture(autouse=True)
def inject_config(config_injector):
config_injector({'secret': 'secret',
config_injector({
'secret': 'secret',
'data_dir': '',
'delete_source_files': False})
'delete_source_files': False
})
def test_saving_post(post_factory, user_factory, tag_factory):

View file

@ -1,14 +1,15 @@
from datetime import datetime
import pytest
from szurubooru import db, model
@pytest.fixture(autouse=True)
def inject_config(config_injector):
config_injector({'delete_source_files': False,
'secret': 'secret', 'data_dir': ''})
config_injector({
'delete_source_files': False,
'secret': 'secret',
'data_dir': ''
})
def test_saving_tag(tag_factory):