github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into py3k

Browse source
This commit is contained in:
Alexis Métaireau 2013-01-11 21:24:47 +01:00
commit e11d8aedff
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/test_pelican.py
View file

@ -12,8 +12,6 @@ from shutil import rmtree
import locale import locale
import logging import logging
from mock import patch
from pelican import Pelican from pelican import Pelican
from pelican.settings import read_settings from pelican.settings import read_settings
from .support import LogCountHandler from .support import LogCountHandler
@ -75,6 +73,7 @@ class TestPelican(unittest.TestCase):
settings = read_settings(filename=None, override={ settings = read_settings(filename=None, override={
'PATH': INPUT_PATH, 'PATH': INPUT_PATH,
'OUTPUT_PATH': self.temp_path, 'OUTPUT_PATH': self.temp_path,
'LOCALE': locale.normalize('en_US'),
}) })
pelican = Pelican(settings=settings) pelican = Pelican(settings=settings)
pelican.run() pelican.run()
@ -90,6 +89,7 @@ class TestPelican(unittest.TestCase):
settings = read_settings(filename=SAMPLE_CONFIG, override={ settings = read_settings(filename=SAMPLE_CONFIG, override={
'PATH': INPUT_PATH, 'PATH': INPUT_PATH,
'OUTPUT_PATH': self.temp_path, 'OUTPUT_PATH': self.temp_path,
'LOCALE': locale.normalize('en_US'),
}) })
pelican = Pelican(settings=settings) pelican = Pelican(settings=settings)
pelican.run() pelican.run()