Fix writer.py and test_encrypt.py

This commit is contained in:
Bowen Ding
2020-04-13 16:26:43 +08:00
parent 228a36bb63
commit 2c4fdd687d
2 changed files with 2 additions and 10 deletions

View File

@@ -114,8 +114,7 @@ class AbstractWriter:
def write(self, album):
"""Generate the HTML page and save it."""
context = self.generate_context(album)
for receiver in signals.before_render.receivers_for(context):
context = receiver(context)
signals.before_render.send(context)
page = self.template.render(**context)
output_file = os.path.join(album.dst_path, album.output_file)

View File

@@ -2,7 +2,6 @@ import os
import pickle
from io import BytesIO
import pytest
from sigal import init_plugins
from sigal.gallery import Gallery
from sigal.plugins.encrypt import endec
@@ -11,12 +10,6 @@ from sigal.plugins.encrypt.encrypt import cache_key
CURRENT_DIR = os.path.dirname(__file__)
@pytest.fixture()
def remove_cache(settings):
yield
cachepath = os.path.join(settings['destination'], ".encryptCache")
os.remove(cachepath)
def get_key_tag(settings):
options = settings["encrypt_options"]
key = endec.kdf_gen_key(
@@ -27,7 +20,7 @@ def get_key_tag(settings):
tag = options["gcm_tag"].encode("utf-8")
return (key, tag)
def test_encrypt(settings, tmpdir, disconnect_signals, remove_cache):
def test_encrypt(settings, tmpdir, disconnect_signals):
settings['destination'] = str(tmpdir)
if "sigal.plugins.encrypt" not in settings["plugins"]:
settings['plugins'] += ["sigal.plugins.encrypt"]