diff --git a/.gitignore b/.gitignore index 1ae0e9f6..d76072b0 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,8 @@ dist tags .tox .coverage +/.env +/.cache htmlcov six-*.egg/ *.orig diff --git a/.travis.yml b/.travis.yml index f5a7f04f..3f4f6717 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,10 @@ language: python +env: + - TESTENV=py27 + - TESTENV=py33 + - TESTENV=py34 python: - - "2.7" - - "3.3" - - "3.4" + - "3.4" addons: apt_packages: - pandoc @@ -10,12 +12,11 @@ before_install: - sudo apt-get update -qq - sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8 install: - - pip install . - - pip install -r dev_requirements.txt - - pip install nose-cov -script: nosetests -sv --with-coverage --cover-package=pelican pelican + - pip install coveralls -U virtualenv py -e . -r dev_requirements.txt tox +script: + - tox -e $TESTENV --sitepackages after_success: - - pip install coveralls + - py.test --cov=pelican --cov-report=term-missing tests - coveralls notifications: irc: diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..e804cb63 --- /dev/null +++ b/Makefile @@ -0,0 +1,13 @@ +# create virtual environment +PYTHON = python2.7 + +.env: + virtualenv .env -p $(PYTHON) + +# install all needed for development +develop: .env + .env/bin/pip install -e . -r dev_requirements.txt tox + +# clean the development envrironment +clean: + -rm -rf .env diff --git a/dev_requirements.txt b/dev_requirements.txt index a7c10719..e220d14d 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -1,5 +1,8 @@ # Tests mock +pytest +pytest-cache +pytest-cov # Optional Packages Markdown diff --git a/docs/changelog.rst b/docs/changelog.rst index 52367cec..a413b9a3 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,11 @@ Release history ############### +Unreleased +========== + +* Switch to pytest test runner. + 3.5.0 (2014-11-04) ================== diff --git a/docs/contribute.rst b/docs/contribute.rst index 2962ddb1..6c098d5d 100644 --- a/docs/contribute.rst +++ b/docs/contribute.rst @@ -66,10 +66,13 @@ Each time you add a feature, there are two things to do regarding tests: check that the existing tests pass, and add tests for the new feature or bugfix. -The tests live in ``pelican/tests`` and you can run them using the -"discover" feature of ``unittest``:: +The tests live in ``tests`` and you can run them using the ``pytest``runner:: - $ python -m unittest discover + $ py.test tests + +For full multipython testing, use ``tox``:: + + $ tox After making your changes and running the tests, you may see a test failure mentioning that "some generated files differ from the expected functional tests @@ -78,11 +81,11 @@ Pelican, and the changes to that output are expected and deemed correct given the nature of your changes, then you should update the output used by the functional tests. To do so, you can use the following two commands:: - $ LC_ALL=en_US.utf8 pelican -o pelican/tests/output/custom/ \ + $ LC_ALL=en_US.utf8 pelican -o tests/output/custom/ \ -s samples/pelican.conf.py samples/content/ - $ LC_ALL=fr_FR.utf8 pelican -o pelican/tests/output/custom_locale/ \ + $ LC_ALL=fr_FR.utf8 pelican -o tests/output/custom_locale/ \ -s samples/pelican.conf_FR.py samples/content/ - $ LC_ALL=en_US.utf8 pelican -o pelican/tests/output/basic/ \ + $ LC_ALL=en_US.utf8 pelican -o tests/output/basic/ \ samples/content/ Testing on Python 2 and 3 diff --git a/setup.py b/setup.py index 8e4eff34..fae6f310 100755 --- a/setup.py +++ b/setup.py @@ -45,5 +45,4 @@ setup( 'Topic :: Internet :: WWW/HTTP', 'Topic :: Software Development :: Libraries :: Python Modules', ], - test_suite='pelican.tests', ) diff --git a/pelican/tests/TestPages/bad_page.rst b/tests/TestPages/bad_page.rst similarity index 100% rename from pelican/tests/TestPages/bad_page.rst rename to tests/TestPages/bad_page.rst diff --git a/pelican/tests/TestPages/hidden_page.rst b/tests/TestPages/hidden_page.rst similarity index 100% rename from pelican/tests/TestPages/hidden_page.rst rename to tests/TestPages/hidden_page.rst diff --git a/pelican/tests/TestPages/hidden_page_markdown.md b/tests/TestPages/hidden_page_markdown.md similarity index 100% rename from pelican/tests/TestPages/hidden_page_markdown.md rename to tests/TestPages/hidden_page_markdown.md diff --git a/pelican/tests/TestPages/hidden_page_with_template.rst b/tests/TestPages/hidden_page_with_template.rst similarity index 100% rename from pelican/tests/TestPages/hidden_page_with_template.rst rename to tests/TestPages/hidden_page_with_template.rst diff --git a/pelican/tests/TestPages/page.rst b/tests/TestPages/page.rst similarity index 100% rename from pelican/tests/TestPages/page.rst rename to tests/TestPages/page.rst diff --git a/pelican/tests/TestPages/page_markdown.md b/tests/TestPages/page_markdown.md similarity index 100% rename from pelican/tests/TestPages/page_markdown.md rename to tests/TestPages/page_markdown.md diff --git a/pelican/tests/TestPages/page_used_for_sorting_test.rst b/tests/TestPages/page_used_for_sorting_test.rst similarity index 100% rename from pelican/tests/TestPages/page_used_for_sorting_test.rst rename to tests/TestPages/page_used_for_sorting_test.rst diff --git a/pelican/tests/TestPages/page_with_category_and_tag_links.md b/tests/TestPages/page_with_category_and_tag_links.md similarity index 100% rename from pelican/tests/TestPages/page_with_category_and_tag_links.md rename to tests/TestPages/page_with_category_and_tag_links.md diff --git a/pelican/tests/TestPages/page_with_template.rst b/tests/TestPages/page_with_template.rst similarity index 100% rename from pelican/tests/TestPages/page_with_template.rst rename to tests/TestPages/page_with_template.rst diff --git a/pelican/tests/__init__.py b/tests/__init__.py similarity index 100% rename from pelican/tests/__init__.py rename to tests/__init__.py diff --git a/pelican/tests/content/2012-11-29_rst_w_filename_meta#foo-bar.rst b/tests/content/2012-11-29_rst_w_filename_meta#foo-bar.rst similarity index 100% rename from pelican/tests/content/2012-11-29_rst_w_filename_meta#foo-bar.rst rename to tests/content/2012-11-29_rst_w_filename_meta#foo-bar.rst diff --git a/pelican/tests/content/2012-11-30_md_w_filename_meta#foo-bar.md b/tests/content/2012-11-30_md_w_filename_meta#foo-bar.md similarity index 100% rename from pelican/tests/content/2012-11-30_md_w_filename_meta#foo-bar.md rename to tests/content/2012-11-30_md_w_filename_meta#foo-bar.md diff --git a/pelican/tests/content/TestCategory/article_with_category.rst b/tests/content/TestCategory/article_with_category.rst similarity index 100% rename from pelican/tests/content/TestCategory/article_with_category.rst rename to tests/content/TestCategory/article_with_category.rst diff --git a/pelican/tests/content/TestCategory/article_without_category.rst b/tests/content/TestCategory/article_without_category.rst similarity index 100% rename from pelican/tests/content/TestCategory/article_without_category.rst rename to tests/content/TestCategory/article_without_category.rst diff --git a/pelican/tests/content/article.rst b/tests/content/article.rst similarity index 100% rename from pelican/tests/content/article.rst rename to tests/content/article.rst diff --git a/pelican/tests/content/article_with_code_block.rst b/tests/content/article_with_code_block.rst similarity index 100% rename from pelican/tests/content/article_with_code_block.rst rename to tests/content/article_with_code_block.rst diff --git a/pelican/tests/content/article_with_comments.html b/tests/content/article_with_comments.html similarity index 100% rename from pelican/tests/content/article_with_comments.html rename to tests/content/article_with_comments.html diff --git a/pelican/tests/content/article_with_keywords.html b/tests/content/article_with_keywords.html similarity index 100% rename from pelican/tests/content/article_with_keywords.html rename to tests/content/article_with_keywords.html diff --git a/pelican/tests/content/article_with_markdown_and_footnote.md b/tests/content/article_with_markdown_and_footnote.md similarity index 100% rename from pelican/tests/content/article_with_markdown_and_footnote.md rename to tests/content/article_with_markdown_and_footnote.md diff --git a/pelican/tests/content/article_with_markdown_and_nonascii_summary.md b/tests/content/article_with_markdown_and_nonascii_summary.md similarity index 100% rename from pelican/tests/content/article_with_markdown_and_nonascii_summary.md rename to tests/content/article_with_markdown_and_nonascii_summary.md diff --git a/pelican/tests/content/article_with_markdown_and_summary_metadata_multi.md b/tests/content/article_with_markdown_and_summary_metadata_multi.md similarity index 100% rename from pelican/tests/content/article_with_markdown_and_summary_metadata_multi.md rename to tests/content/article_with_markdown_and_summary_metadata_multi.md diff --git a/pelican/tests/content/article_with_markdown_and_summary_metadata_single.md b/tests/content/article_with_markdown_and_summary_metadata_single.md similarity index 100% rename from pelican/tests/content/article_with_markdown_and_summary_metadata_single.md rename to tests/content/article_with_markdown_and_summary_metadata_single.md diff --git a/pelican/tests/content/article_with_markdown_extension.markdown b/tests/content/article_with_markdown_extension.markdown similarity index 100% rename from pelican/tests/content/article_with_markdown_extension.markdown rename to tests/content/article_with_markdown_extension.markdown diff --git a/pelican/tests/content/article_with_markdown_markup_extensions.md b/tests/content/article_with_markdown_markup_extensions.md similarity index 100% rename from pelican/tests/content/article_with_markdown_markup_extensions.md rename to tests/content/article_with_markdown_markup_extensions.md diff --git a/pelican/tests/content/article_with_md_extension.md b/tests/content/article_with_md_extension.md similarity index 100% rename from pelican/tests/content/article_with_md_extension.md rename to tests/content/article_with_md_extension.md diff --git a/pelican/tests/content/article_with_mdown_extension.mdown b/tests/content/article_with_mdown_extension.mdown similarity index 100% rename from pelican/tests/content/article_with_mdown_extension.mdown rename to tests/content/article_with_mdown_extension.mdown diff --git a/pelican/tests/content/article_with_metadata.html b/tests/content/article_with_metadata.html similarity index 100% rename from pelican/tests/content/article_with_metadata.html rename to tests/content/article_with_metadata.html diff --git a/pelican/tests/content/article_with_metadata.rst b/tests/content/article_with_metadata.rst similarity index 100% rename from pelican/tests/content/article_with_metadata.rst rename to tests/content/article_with_metadata.rst diff --git a/pelican/tests/content/article_with_metadata.unknownextension b/tests/content/article_with_metadata.unknownextension similarity index 100% rename from pelican/tests/content/article_with_metadata.unknownextension rename to tests/content/article_with_metadata.unknownextension diff --git a/pelican/tests/content/article_with_metadata_and_contents.html b/tests/content/article_with_metadata_and_contents.html similarity index 100% rename from pelican/tests/content/article_with_metadata_and_contents.html rename to tests/content/article_with_metadata_and_contents.html diff --git a/pelican/tests/content/article_with_mkd_extension.mkd b/tests/content/article_with_mkd_extension.mkd similarity index 100% rename from pelican/tests/content/article_with_mkd_extension.mkd rename to tests/content/article_with_mkd_extension.mkd diff --git a/pelican/tests/content/article_with_multiple_authors.html b/tests/content/article_with_multiple_authors.html similarity index 100% rename from pelican/tests/content/article_with_multiple_authors.html rename to tests/content/article_with_multiple_authors.html diff --git a/pelican/tests/content/article_with_multiple_authors.rst b/tests/content/article_with_multiple_authors.rst similarity index 100% rename from pelican/tests/content/article_with_multiple_authors.rst rename to tests/content/article_with_multiple_authors.rst diff --git a/pelican/tests/content/article_with_nonconformant_meta_tags.html b/tests/content/article_with_nonconformant_meta_tags.html similarity index 100% rename from pelican/tests/content/article_with_nonconformant_meta_tags.html rename to tests/content/article_with_nonconformant_meta_tags.html diff --git a/pelican/tests/content/article_with_null_attributes.html b/tests/content/article_with_null_attributes.html similarity index 100% rename from pelican/tests/content/article_with_null_attributes.html rename to tests/content/article_with_null_attributes.html diff --git a/pelican/tests/content/article_with_template.rst b/tests/content/article_with_template.rst similarity index 100% rename from pelican/tests/content/article_with_template.rst rename to tests/content/article_with_template.rst diff --git a/pelican/tests/content/article_with_uppercase_metadata.html b/tests/content/article_with_uppercase_metadata.html similarity index 100% rename from pelican/tests/content/article_with_uppercase_metadata.html rename to tests/content/article_with_uppercase_metadata.html diff --git a/pelican/tests/content/article_with_uppercase_metadata.rst b/tests/content/article_with_uppercase_metadata.rst similarity index 100% rename from pelican/tests/content/article_with_uppercase_metadata.rst rename to tests/content/article_with_uppercase_metadata.rst diff --git a/pelican/tests/content/article_without_category.rst b/tests/content/article_without_category.rst similarity index 100% rename from pelican/tests/content/article_without_category.rst rename to tests/content/article_without_category.rst diff --git a/pelican/tests/content/wordpress_content_decoded b/tests/content/wordpress_content_decoded similarity index 100% rename from pelican/tests/content/wordpress_content_decoded rename to tests/content/wordpress_content_decoded diff --git a/pelican/tests/content/wordpress_content_encoded b/tests/content/wordpress_content_encoded similarity index 100% rename from pelican/tests/content/wordpress_content_encoded rename to tests/content/wordpress_content_encoded diff --git a/pelican/tests/content/wordpressexport.xml b/tests/content/wordpressexport.xml similarity index 100% rename from pelican/tests/content/wordpressexport.xml rename to tests/content/wordpressexport.xml diff --git a/pelican/tests/default_conf.py b/tests/default_conf.py similarity index 100% rename from pelican/tests/default_conf.py rename to tests/default_conf.py diff --git a/pelican/tests/mixed_content/fake_image.jpg b/tests/mixed_content/fake_image.jpg similarity index 100% rename from pelican/tests/mixed_content/fake_image.jpg rename to tests/mixed_content/fake_image.jpg diff --git a/pelican/tests/mixed_content/short_page.md b/tests/mixed_content/short_page.md similarity index 100% rename from pelican/tests/mixed_content/short_page.md rename to tests/mixed_content/short_page.md diff --git a/pelican/tests/mixed_content/subdir/subdir_fake_image.jpg b/tests/mixed_content/subdir/subdir_fake_image.jpg similarity index 100% rename from pelican/tests/mixed_content/subdir/subdir_fake_image.jpg rename to tests/mixed_content/subdir/subdir_fake_image.jpg diff --git a/pelican/tests/nested_content/maindir/maindir.md b/tests/nested_content/maindir/maindir.md similarity index 100% rename from pelican/tests/nested_content/maindir/maindir.md rename to tests/nested_content/maindir/maindir.md diff --git a/pelican/tests/nested_content/maindir/subdir/subdir.md b/tests/nested_content/maindir/subdir/subdir.md similarity index 100% rename from pelican/tests/nested_content/maindir/subdir/subdir.md rename to tests/nested_content/maindir/subdir/subdir.md diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/tests/output/basic/a-markdown-powered-article.html similarity index 100% rename from pelican/tests/output/basic/a-markdown-powered-article.html rename to tests/output/basic/a-markdown-powered-article.html diff --git a/pelican/tests/output/basic/archives.html b/tests/output/basic/archives.html similarity index 100% rename from pelican/tests/output/basic/archives.html rename to tests/output/basic/archives.html diff --git a/pelican/tests/output/basic/article-1.html b/tests/output/basic/article-1.html similarity index 100% rename from pelican/tests/output/basic/article-1.html rename to tests/output/basic/article-1.html diff --git a/pelican/tests/output/basic/article-2.html b/tests/output/basic/article-2.html similarity index 100% rename from pelican/tests/output/basic/article-2.html rename to tests/output/basic/article-2.html diff --git a/pelican/tests/output/basic/article-3.html b/tests/output/basic/article-3.html similarity index 100% rename from pelican/tests/output/basic/article-3.html rename to tests/output/basic/article-3.html diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/tests/output/basic/author/alexis-metaireau.html similarity index 100% rename from pelican/tests/output/basic/author/alexis-metaireau.html rename to tests/output/basic/author/alexis-metaireau.html diff --git a/pelican/tests/output/basic/authors.html b/tests/output/basic/authors.html similarity index 100% rename from pelican/tests/output/basic/authors.html rename to tests/output/basic/authors.html diff --git a/pelican/tests/output/basic/categories.html b/tests/output/basic/categories.html similarity index 100% rename from pelican/tests/output/basic/categories.html rename to tests/output/basic/categories.html diff --git a/pelican/tests/output/basic/category/bar.html b/tests/output/basic/category/bar.html similarity index 100% rename from pelican/tests/output/basic/category/bar.html rename to tests/output/basic/category/bar.html diff --git a/pelican/tests/output/basic/category/cat1.html b/tests/output/basic/category/cat1.html similarity index 100% rename from pelican/tests/output/basic/category/cat1.html rename to tests/output/basic/category/cat1.html diff --git a/pelican/tests/output/basic/category/misc.html b/tests/output/basic/category/misc.html similarity index 100% rename from pelican/tests/output/basic/category/misc.html rename to tests/output/basic/category/misc.html diff --git a/pelican/tests/output/basic/category/yeah.html b/tests/output/basic/category/yeah.html similarity index 100% rename from pelican/tests/output/basic/category/yeah.html rename to tests/output/basic/category/yeah.html diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml b/tests/output/basic/feeds/alexis-metaireau.atom.xml similarity index 100% rename from pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml rename to tests/output/basic/feeds/alexis-metaireau.atom.xml diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml b/tests/output/basic/feeds/alexis-metaireau.rss.xml similarity index 100% rename from pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml rename to tests/output/basic/feeds/alexis-metaireau.rss.xml diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/tests/output/basic/feeds/all-en.atom.xml similarity index 100% rename from pelican/tests/output/basic/feeds/all-en.atom.xml rename to tests/output/basic/feeds/all-en.atom.xml diff --git a/pelican/tests/output/basic/feeds/all-fr.atom.xml b/tests/output/basic/feeds/all-fr.atom.xml similarity index 100% rename from pelican/tests/output/basic/feeds/all-fr.atom.xml rename to tests/output/basic/feeds/all-fr.atom.xml diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/tests/output/basic/feeds/all.atom.xml similarity index 100% rename from pelican/tests/output/basic/feeds/all.atom.xml rename to tests/output/basic/feeds/all.atom.xml diff --git a/pelican/tests/output/basic/feeds/bar.atom.xml b/tests/output/basic/feeds/bar.atom.xml similarity index 100% rename from pelican/tests/output/basic/feeds/bar.atom.xml rename to tests/output/basic/feeds/bar.atom.xml diff --git a/pelican/tests/output/basic/feeds/cat1.atom.xml b/tests/output/basic/feeds/cat1.atom.xml similarity index 100% rename from pelican/tests/output/basic/feeds/cat1.atom.xml rename to tests/output/basic/feeds/cat1.atom.xml diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/tests/output/basic/feeds/misc.atom.xml similarity index 100% rename from pelican/tests/output/basic/feeds/misc.atom.xml rename to tests/output/basic/feeds/misc.atom.xml diff --git a/pelican/tests/output/basic/feeds/yeah.atom.xml b/tests/output/basic/feeds/yeah.atom.xml similarity index 100% rename from pelican/tests/output/basic/feeds/yeah.atom.xml rename to tests/output/basic/feeds/yeah.atom.xml diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/tests/output/basic/filename_metadata-example.html similarity index 100% rename from pelican/tests/output/basic/filename_metadata-example.html rename to tests/output/basic/filename_metadata-example.html diff --git a/pelican/tests/output/basic/index.html b/tests/output/basic/index.html similarity index 100% rename from pelican/tests/output/basic/index.html rename to tests/output/basic/index.html diff --git a/pelican/tests/output/basic/oh-yeah.html b/tests/output/basic/oh-yeah.html similarity index 100% rename from pelican/tests/output/basic/oh-yeah.html rename to tests/output/basic/oh-yeah.html diff --git a/pelican/tests/output/basic/override/index.html b/tests/output/basic/override/index.html similarity index 100% rename from pelican/tests/output/basic/override/index.html rename to tests/output/basic/override/index.html diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/tests/output/basic/pages/this-is-a-test-hidden-page.html similarity index 100% rename from pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html rename to tests/output/basic/pages/this-is-a-test-hidden-page.html diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/tests/output/basic/pages/this-is-a-test-page.html similarity index 100% rename from pelican/tests/output/basic/pages/this-is-a-test-page.html rename to tests/output/basic/pages/this-is-a-test-page.html diff --git a/pelican/tests/output/basic/second-article-fr.html b/tests/output/basic/second-article-fr.html similarity index 100% rename from pelican/tests/output/basic/second-article-fr.html rename to tests/output/basic/second-article-fr.html diff --git a/pelican/tests/output/basic/second-article.html b/tests/output/basic/second-article.html similarity index 100% rename from pelican/tests/output/basic/second-article.html rename to tests/output/basic/second-article.html diff --git a/pelican/tests/output/basic/tag/bar.html b/tests/output/basic/tag/bar.html similarity index 100% rename from pelican/tests/output/basic/tag/bar.html rename to tests/output/basic/tag/bar.html diff --git a/pelican/tests/output/basic/tag/baz.html b/tests/output/basic/tag/baz.html similarity index 100% rename from pelican/tests/output/basic/tag/baz.html rename to tests/output/basic/tag/baz.html diff --git a/pelican/tests/output/basic/tag/foo.html b/tests/output/basic/tag/foo.html similarity index 100% rename from pelican/tests/output/basic/tag/foo.html rename to tests/output/basic/tag/foo.html diff --git a/pelican/tests/output/basic/tag/foobar.html b/tests/output/basic/tag/foobar.html similarity index 100% rename from pelican/tests/output/basic/tag/foobar.html rename to tests/output/basic/tag/foobar.html diff --git a/pelican/tests/output/basic/tag/oh.html b/tests/output/basic/tag/oh.html similarity index 100% rename from pelican/tests/output/basic/tag/oh.html rename to tests/output/basic/tag/oh.html diff --git a/pelican/tests/output/basic/tag/yeah.html b/tests/output/basic/tag/yeah.html similarity index 100% rename from pelican/tests/output/basic/tag/yeah.html rename to tests/output/basic/tag/yeah.html diff --git a/pelican/tests/output/basic/tags.html b/tests/output/basic/tags.html similarity index 100% rename from pelican/tests/output/basic/tags.html rename to tests/output/basic/tags.html diff --git a/pelican/tests/output/basic/theme/css/main.css b/tests/output/basic/theme/css/main.css similarity index 100% rename from pelican/tests/output/basic/theme/css/main.css rename to tests/output/basic/theme/css/main.css diff --git a/pelican/tests/output/basic/theme/css/pygment.css b/tests/output/basic/theme/css/pygment.css similarity index 100% rename from pelican/tests/output/basic/theme/css/pygment.css rename to tests/output/basic/theme/css/pygment.css diff --git a/pelican/tests/output/basic/theme/css/reset.css b/tests/output/basic/theme/css/reset.css similarity index 100% rename from pelican/tests/output/basic/theme/css/reset.css rename to tests/output/basic/theme/css/reset.css diff --git a/pelican/tests/output/basic/theme/css/typogrify.css b/tests/output/basic/theme/css/typogrify.css similarity index 100% rename from pelican/tests/output/basic/theme/css/typogrify.css rename to tests/output/basic/theme/css/typogrify.css diff --git a/pelican/tests/output/basic/theme/css/wide.css b/tests/output/basic/theme/css/wide.css similarity index 100% rename from pelican/tests/output/basic/theme/css/wide.css rename to tests/output/basic/theme/css/wide.css diff --git a/pelican/tests/output/basic/theme/images/icons/aboutme.png b/tests/output/basic/theme/images/icons/aboutme.png similarity index 100% rename from pelican/tests/output/basic/theme/images/icons/aboutme.png rename to tests/output/basic/theme/images/icons/aboutme.png diff --git a/pelican/tests/output/basic/theme/images/icons/bitbucket.png b/tests/output/basic/theme/images/icons/bitbucket.png similarity index 100% rename from pelican/tests/output/basic/theme/images/icons/bitbucket.png rename to tests/output/basic/theme/images/icons/bitbucket.png diff --git a/pelican/tests/output/basic/theme/images/icons/delicious.png b/tests/output/basic/theme/images/icons/delicious.png similarity index 100% rename from pelican/tests/output/basic/theme/images/icons/delicious.png rename to tests/output/basic/theme/images/icons/delicious.png diff --git a/pelican/tests/output/basic/theme/images/icons/facebook.png b/tests/output/basic/theme/images/icons/facebook.png similarity index 100% rename from pelican/tests/output/basic/theme/images/icons/facebook.png rename to tests/output/basic/theme/images/icons/facebook.png diff --git a/pelican/tests/output/basic/theme/images/icons/github.png b/tests/output/basic/theme/images/icons/github.png similarity index 100% rename from pelican/tests/output/basic/theme/images/icons/github.png rename to tests/output/basic/theme/images/icons/github.png diff --git a/pelican/tests/output/basic/theme/images/icons/gitorious.png b/tests/output/basic/theme/images/icons/gitorious.png similarity index 100% rename from pelican/tests/output/basic/theme/images/icons/gitorious.png rename to tests/output/basic/theme/images/icons/gitorious.png diff --git a/pelican/tests/output/basic/theme/images/icons/gittip.png b/tests/output/basic/theme/images/icons/gittip.png similarity index 100% rename from pelican/tests/output/basic/theme/images/icons/gittip.png rename to tests/output/basic/theme/images/icons/gittip.png diff --git a/pelican/tests/output/basic/theme/images/icons/google-groups.png b/tests/output/basic/theme/images/icons/google-groups.png similarity index 100% rename from pelican/tests/output/basic/theme/images/icons/google-groups.png rename to tests/output/basic/theme/images/icons/google-groups.png diff --git a/pelican/tests/output/basic/theme/images/icons/google-plus.png b/tests/output/basic/theme/images/icons/google-plus.png similarity index 100% rename from pelican/tests/output/basic/theme/images/icons/google-plus.png rename to tests/output/basic/theme/images/icons/google-plus.png diff --git a/pelican/tests/output/basic/theme/images/icons/hackernews.png b/tests/output/basic/theme/images/icons/hackernews.png similarity index 100% rename from pelican/tests/output/basic/theme/images/icons/hackernews.png rename to tests/output/basic/theme/images/icons/hackernews.png diff --git a/pelican/tests/output/basic/theme/images/icons/lastfm.png b/tests/output/basic/theme/images/icons/lastfm.png similarity index 100% rename from pelican/tests/output/basic/theme/images/icons/lastfm.png rename to tests/output/basic/theme/images/icons/lastfm.png diff --git a/pelican/tests/output/basic/theme/images/icons/linkedin.png b/tests/output/basic/theme/images/icons/linkedin.png similarity index 100% rename from pelican/tests/output/basic/theme/images/icons/linkedin.png rename to tests/output/basic/theme/images/icons/linkedin.png diff --git a/pelican/tests/output/basic/theme/images/icons/reddit.png b/tests/output/basic/theme/images/icons/reddit.png similarity index 100% rename from pelican/tests/output/basic/theme/images/icons/reddit.png rename to tests/output/basic/theme/images/icons/reddit.png diff --git a/pelican/tests/output/basic/theme/images/icons/rss.png b/tests/output/basic/theme/images/icons/rss.png similarity index 100% rename from pelican/tests/output/basic/theme/images/icons/rss.png rename to tests/output/basic/theme/images/icons/rss.png diff --git a/pelican/tests/output/basic/theme/images/icons/slideshare.png b/tests/output/basic/theme/images/icons/slideshare.png similarity index 100% rename from pelican/tests/output/basic/theme/images/icons/slideshare.png rename to tests/output/basic/theme/images/icons/slideshare.png diff --git a/pelican/tests/output/basic/theme/images/icons/speakerdeck.png b/tests/output/basic/theme/images/icons/speakerdeck.png similarity index 100% rename from pelican/tests/output/basic/theme/images/icons/speakerdeck.png rename to tests/output/basic/theme/images/icons/speakerdeck.png diff --git a/pelican/tests/output/basic/theme/images/icons/stackoverflow.png b/tests/output/basic/theme/images/icons/stackoverflow.png similarity index 100% rename from pelican/tests/output/basic/theme/images/icons/stackoverflow.png rename to tests/output/basic/theme/images/icons/stackoverflow.png diff --git a/pelican/tests/output/basic/theme/images/icons/twitter.png b/tests/output/basic/theme/images/icons/twitter.png similarity index 100% rename from pelican/tests/output/basic/theme/images/icons/twitter.png rename to tests/output/basic/theme/images/icons/twitter.png diff --git a/pelican/tests/output/basic/theme/images/icons/vimeo.png b/tests/output/basic/theme/images/icons/vimeo.png similarity index 100% rename from pelican/tests/output/basic/theme/images/icons/vimeo.png rename to tests/output/basic/theme/images/icons/vimeo.png diff --git a/pelican/tests/output/basic/theme/images/icons/youtube.png b/tests/output/basic/theme/images/icons/youtube.png similarity index 100% rename from pelican/tests/output/basic/theme/images/icons/youtube.png rename to tests/output/basic/theme/images/icons/youtube.png diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/tests/output/basic/this-is-a-super-article.html similarity index 100% rename from pelican/tests/output/basic/this-is-a-super-article.html rename to tests/output/basic/this-is-a-super-article.html diff --git a/pelican/tests/output/basic/unbelievable.html b/tests/output/basic/unbelievable.html similarity index 100% rename from pelican/tests/output/basic/unbelievable.html rename to tests/output/basic/unbelievable.html diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/tests/output/custom/a-markdown-powered-article.html similarity index 100% rename from pelican/tests/output/custom/a-markdown-powered-article.html rename to tests/output/custom/a-markdown-powered-article.html diff --git a/pelican/tests/output/custom/archives.html b/tests/output/custom/archives.html similarity index 100% rename from pelican/tests/output/custom/archives.html rename to tests/output/custom/archives.html diff --git a/pelican/tests/output/custom/article-1.html b/tests/output/custom/article-1.html similarity index 100% rename from pelican/tests/output/custom/article-1.html rename to tests/output/custom/article-1.html diff --git a/pelican/tests/output/custom/article-2.html b/tests/output/custom/article-2.html similarity index 100% rename from pelican/tests/output/custom/article-2.html rename to tests/output/custom/article-2.html diff --git a/pelican/tests/output/custom/article-3.html b/tests/output/custom/article-3.html similarity index 100% rename from pelican/tests/output/custom/article-3.html rename to tests/output/custom/article-3.html diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/tests/output/custom/author/alexis-metaireau.html similarity index 100% rename from pelican/tests/output/custom/author/alexis-metaireau.html rename to tests/output/custom/author/alexis-metaireau.html diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/tests/output/custom/author/alexis-metaireau2.html similarity index 100% rename from pelican/tests/output/custom/author/alexis-metaireau2.html rename to tests/output/custom/author/alexis-metaireau2.html diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/tests/output/custom/author/alexis-metaireau3.html similarity index 100% rename from pelican/tests/output/custom/author/alexis-metaireau3.html rename to tests/output/custom/author/alexis-metaireau3.html diff --git a/pelican/tests/output/custom/authors.html b/tests/output/custom/authors.html similarity index 100% rename from pelican/tests/output/custom/authors.html rename to tests/output/custom/authors.html diff --git a/pelican/tests/output/custom/categories.html b/tests/output/custom/categories.html similarity index 100% rename from pelican/tests/output/custom/categories.html rename to tests/output/custom/categories.html diff --git a/pelican/tests/output/custom/category/bar.html b/tests/output/custom/category/bar.html similarity index 100% rename from pelican/tests/output/custom/category/bar.html rename to tests/output/custom/category/bar.html diff --git a/pelican/tests/output/custom/category/cat1.html b/tests/output/custom/category/cat1.html similarity index 100% rename from pelican/tests/output/custom/category/cat1.html rename to tests/output/custom/category/cat1.html diff --git a/pelican/tests/output/custom/category/misc.html b/tests/output/custom/category/misc.html similarity index 100% rename from pelican/tests/output/custom/category/misc.html rename to tests/output/custom/category/misc.html diff --git a/pelican/tests/output/custom/category/yeah.html b/tests/output/custom/category/yeah.html similarity index 100% rename from pelican/tests/output/custom/category/yeah.html rename to tests/output/custom/category/yeah.html diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/tests/output/custom/drafts/a-draft-article.html similarity index 100% rename from pelican/tests/output/custom/drafts/a-draft-article.html rename to tests/output/custom/drafts/a-draft-article.html diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/tests/output/custom/feeds/alexis-metaireau.atom.xml similarity index 100% rename from pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml rename to tests/output/custom/feeds/alexis-metaireau.atom.xml diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml b/tests/output/custom/feeds/alexis-metaireau.rss.xml similarity index 100% rename from pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml rename to tests/output/custom/feeds/alexis-metaireau.rss.xml diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/tests/output/custom/feeds/all-en.atom.xml similarity index 100% rename from pelican/tests/output/custom/feeds/all-en.atom.xml rename to tests/output/custom/feeds/all-en.atom.xml diff --git a/pelican/tests/output/custom/feeds/all-fr.atom.xml b/tests/output/custom/feeds/all-fr.atom.xml similarity index 100% rename from pelican/tests/output/custom/feeds/all-fr.atom.xml rename to tests/output/custom/feeds/all-fr.atom.xml diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/tests/output/custom/feeds/all.atom.xml similarity index 100% rename from pelican/tests/output/custom/feeds/all.atom.xml rename to tests/output/custom/feeds/all.atom.xml diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/tests/output/custom/feeds/all.rss.xml similarity index 100% rename from pelican/tests/output/custom/feeds/all.rss.xml rename to tests/output/custom/feeds/all.rss.xml diff --git a/pelican/tests/output/custom/feeds/bar.atom.xml b/tests/output/custom/feeds/bar.atom.xml similarity index 100% rename from pelican/tests/output/custom/feeds/bar.atom.xml rename to tests/output/custom/feeds/bar.atom.xml diff --git a/pelican/tests/output/custom/feeds/bar.rss.xml b/tests/output/custom/feeds/bar.rss.xml similarity index 100% rename from pelican/tests/output/custom/feeds/bar.rss.xml rename to tests/output/custom/feeds/bar.rss.xml diff --git a/pelican/tests/output/custom/feeds/cat1.atom.xml b/tests/output/custom/feeds/cat1.atom.xml similarity index 100% rename from pelican/tests/output/custom/feeds/cat1.atom.xml rename to tests/output/custom/feeds/cat1.atom.xml diff --git a/pelican/tests/output/custom/feeds/cat1.rss.xml b/tests/output/custom/feeds/cat1.rss.xml similarity index 100% rename from pelican/tests/output/custom/feeds/cat1.rss.xml rename to tests/output/custom/feeds/cat1.rss.xml diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/tests/output/custom/feeds/misc.atom.xml similarity index 100% rename from pelican/tests/output/custom/feeds/misc.atom.xml rename to tests/output/custom/feeds/misc.atom.xml diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/tests/output/custom/feeds/misc.rss.xml similarity index 100% rename from pelican/tests/output/custom/feeds/misc.rss.xml rename to tests/output/custom/feeds/misc.rss.xml diff --git a/pelican/tests/output/custom/feeds/yeah.atom.xml b/tests/output/custom/feeds/yeah.atom.xml similarity index 100% rename from pelican/tests/output/custom/feeds/yeah.atom.xml rename to tests/output/custom/feeds/yeah.atom.xml diff --git a/pelican/tests/output/custom/feeds/yeah.rss.xml b/tests/output/custom/feeds/yeah.rss.xml similarity index 100% rename from pelican/tests/output/custom/feeds/yeah.rss.xml rename to tests/output/custom/feeds/yeah.rss.xml diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/tests/output/custom/filename_metadata-example.html similarity index 100% rename from pelican/tests/output/custom/filename_metadata-example.html rename to tests/output/custom/filename_metadata-example.html diff --git a/pelican/tests/output/custom/index.html b/tests/output/custom/index.html similarity index 100% rename from pelican/tests/output/custom/index.html rename to tests/output/custom/index.html diff --git a/pelican/tests/output/custom/index2.html b/tests/output/custom/index2.html similarity index 100% rename from pelican/tests/output/custom/index2.html rename to tests/output/custom/index2.html diff --git a/pelican/tests/output/custom/index3.html b/tests/output/custom/index3.html similarity index 100% rename from pelican/tests/output/custom/index3.html rename to tests/output/custom/index3.html diff --git a/pelican/tests/output/custom/jinja2_template.html b/tests/output/custom/jinja2_template.html similarity index 100% rename from pelican/tests/output/custom/jinja2_template.html rename to tests/output/custom/jinja2_template.html diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/tests/output/custom/oh-yeah-fr.html similarity index 100% rename from pelican/tests/output/custom/oh-yeah-fr.html rename to tests/output/custom/oh-yeah-fr.html diff --git a/pelican/tests/output/custom/oh-yeah.html b/tests/output/custom/oh-yeah.html similarity index 100% rename from pelican/tests/output/custom/oh-yeah.html rename to tests/output/custom/oh-yeah.html diff --git a/pelican/tests/output/custom/override/index.html b/tests/output/custom/override/index.html similarity index 100% rename from pelican/tests/output/custom/override/index.html rename to tests/output/custom/override/index.html diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/tests/output/custom/pages/this-is-a-test-hidden-page.html similarity index 100% rename from pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html rename to tests/output/custom/pages/this-is-a-test-hidden-page.html diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/tests/output/custom/pages/this-is-a-test-page.html similarity index 100% rename from pelican/tests/output/custom/pages/this-is-a-test-page.html rename to tests/output/custom/pages/this-is-a-test-page.html diff --git a/pelican/tests/output/custom/pictures/Fat_Cat.jpg b/tests/output/custom/pictures/Fat_Cat.jpg similarity index 100% rename from pelican/tests/output/custom/pictures/Fat_Cat.jpg rename to tests/output/custom/pictures/Fat_Cat.jpg diff --git a/pelican/tests/output/custom/pictures/Sushi.jpg b/tests/output/custom/pictures/Sushi.jpg similarity index 100% rename from pelican/tests/output/custom/pictures/Sushi.jpg rename to tests/output/custom/pictures/Sushi.jpg diff --git a/pelican/tests/output/custom/pictures/Sushi_Macro.jpg b/tests/output/custom/pictures/Sushi_Macro.jpg similarity index 100% rename from pelican/tests/output/custom/pictures/Sushi_Macro.jpg rename to tests/output/custom/pictures/Sushi_Macro.jpg diff --git a/pelican/tests/output/custom/robots.txt b/tests/output/custom/robots.txt similarity index 100% rename from pelican/tests/output/custom/robots.txt rename to tests/output/custom/robots.txt diff --git a/pelican/tests/output/custom/second-article-fr.html b/tests/output/custom/second-article-fr.html similarity index 100% rename from pelican/tests/output/custom/second-article-fr.html rename to tests/output/custom/second-article-fr.html diff --git a/pelican/tests/output/custom/second-article.html b/tests/output/custom/second-article.html similarity index 100% rename from pelican/tests/output/custom/second-article.html rename to tests/output/custom/second-article.html diff --git a/pelican/tests/output/custom/tag/bar.html b/tests/output/custom/tag/bar.html similarity index 100% rename from pelican/tests/output/custom/tag/bar.html rename to tests/output/custom/tag/bar.html diff --git a/pelican/tests/output/custom/tag/baz.html b/tests/output/custom/tag/baz.html similarity index 100% rename from pelican/tests/output/custom/tag/baz.html rename to tests/output/custom/tag/baz.html diff --git a/pelican/tests/output/custom/tag/foo.html b/tests/output/custom/tag/foo.html similarity index 100% rename from pelican/tests/output/custom/tag/foo.html rename to tests/output/custom/tag/foo.html diff --git a/pelican/tests/output/custom/tag/foobar.html b/tests/output/custom/tag/foobar.html similarity index 100% rename from pelican/tests/output/custom/tag/foobar.html rename to tests/output/custom/tag/foobar.html diff --git a/pelican/tests/output/custom/tag/oh.html b/tests/output/custom/tag/oh.html similarity index 100% rename from pelican/tests/output/custom/tag/oh.html rename to tests/output/custom/tag/oh.html diff --git a/pelican/tests/output/custom/tag/yeah.html b/tests/output/custom/tag/yeah.html similarity index 100% rename from pelican/tests/output/custom/tag/yeah.html rename to tests/output/custom/tag/yeah.html diff --git a/pelican/tests/output/custom/tags.html b/tests/output/custom/tags.html similarity index 100% rename from pelican/tests/output/custom/tags.html rename to tests/output/custom/tags.html diff --git a/pelican/tests/output/custom/theme/css/main.css b/tests/output/custom/theme/css/main.css similarity index 100% rename from pelican/tests/output/custom/theme/css/main.css rename to tests/output/custom/theme/css/main.css diff --git a/pelican/tests/output/custom/theme/css/pygment.css b/tests/output/custom/theme/css/pygment.css similarity index 100% rename from pelican/tests/output/custom/theme/css/pygment.css rename to tests/output/custom/theme/css/pygment.css diff --git a/pelican/tests/output/custom/theme/css/reset.css b/tests/output/custom/theme/css/reset.css similarity index 100% rename from pelican/tests/output/custom/theme/css/reset.css rename to tests/output/custom/theme/css/reset.css diff --git a/pelican/tests/output/custom/theme/css/typogrify.css b/tests/output/custom/theme/css/typogrify.css similarity index 100% rename from pelican/tests/output/custom/theme/css/typogrify.css rename to tests/output/custom/theme/css/typogrify.css diff --git a/pelican/tests/output/custom/theme/css/wide.css b/tests/output/custom/theme/css/wide.css similarity index 100% rename from pelican/tests/output/custom/theme/css/wide.css rename to tests/output/custom/theme/css/wide.css diff --git a/pelican/tests/output/custom/theme/images/icons/aboutme.png b/tests/output/custom/theme/images/icons/aboutme.png similarity index 100% rename from pelican/tests/output/custom/theme/images/icons/aboutme.png rename to tests/output/custom/theme/images/icons/aboutme.png diff --git a/pelican/tests/output/custom/theme/images/icons/bitbucket.png b/tests/output/custom/theme/images/icons/bitbucket.png similarity index 100% rename from pelican/tests/output/custom/theme/images/icons/bitbucket.png rename to tests/output/custom/theme/images/icons/bitbucket.png diff --git a/pelican/tests/output/custom/theme/images/icons/delicious.png b/tests/output/custom/theme/images/icons/delicious.png similarity index 100% rename from pelican/tests/output/custom/theme/images/icons/delicious.png rename to tests/output/custom/theme/images/icons/delicious.png diff --git a/pelican/tests/output/custom/theme/images/icons/facebook.png b/tests/output/custom/theme/images/icons/facebook.png similarity index 100% rename from pelican/tests/output/custom/theme/images/icons/facebook.png rename to tests/output/custom/theme/images/icons/facebook.png diff --git a/pelican/tests/output/custom/theme/images/icons/github.png b/tests/output/custom/theme/images/icons/github.png similarity index 100% rename from pelican/tests/output/custom/theme/images/icons/github.png rename to tests/output/custom/theme/images/icons/github.png diff --git a/pelican/tests/output/custom/theme/images/icons/gitorious.png b/tests/output/custom/theme/images/icons/gitorious.png similarity index 100% rename from pelican/tests/output/custom/theme/images/icons/gitorious.png rename to tests/output/custom/theme/images/icons/gitorious.png diff --git a/pelican/tests/output/custom/theme/images/icons/gittip.png b/tests/output/custom/theme/images/icons/gittip.png similarity index 100% rename from pelican/tests/output/custom/theme/images/icons/gittip.png rename to tests/output/custom/theme/images/icons/gittip.png diff --git a/pelican/tests/output/custom/theme/images/icons/google-groups.png b/tests/output/custom/theme/images/icons/google-groups.png similarity index 100% rename from pelican/tests/output/custom/theme/images/icons/google-groups.png rename to tests/output/custom/theme/images/icons/google-groups.png diff --git a/pelican/tests/output/custom/theme/images/icons/google-plus.png b/tests/output/custom/theme/images/icons/google-plus.png similarity index 100% rename from pelican/tests/output/custom/theme/images/icons/google-plus.png rename to tests/output/custom/theme/images/icons/google-plus.png diff --git a/pelican/tests/output/custom/theme/images/icons/hackernews.png b/tests/output/custom/theme/images/icons/hackernews.png similarity index 100% rename from pelican/tests/output/custom/theme/images/icons/hackernews.png rename to tests/output/custom/theme/images/icons/hackernews.png diff --git a/pelican/tests/output/custom/theme/images/icons/lastfm.png b/tests/output/custom/theme/images/icons/lastfm.png similarity index 100% rename from pelican/tests/output/custom/theme/images/icons/lastfm.png rename to tests/output/custom/theme/images/icons/lastfm.png diff --git a/pelican/tests/output/custom/theme/images/icons/linkedin.png b/tests/output/custom/theme/images/icons/linkedin.png similarity index 100% rename from pelican/tests/output/custom/theme/images/icons/linkedin.png rename to tests/output/custom/theme/images/icons/linkedin.png diff --git a/pelican/tests/output/custom/theme/images/icons/reddit.png b/tests/output/custom/theme/images/icons/reddit.png similarity index 100% rename from pelican/tests/output/custom/theme/images/icons/reddit.png rename to tests/output/custom/theme/images/icons/reddit.png diff --git a/pelican/tests/output/custom/theme/images/icons/rss.png b/tests/output/custom/theme/images/icons/rss.png similarity index 100% rename from pelican/tests/output/custom/theme/images/icons/rss.png rename to tests/output/custom/theme/images/icons/rss.png diff --git a/pelican/tests/output/custom/theme/images/icons/slideshare.png b/tests/output/custom/theme/images/icons/slideshare.png similarity index 100% rename from pelican/tests/output/custom/theme/images/icons/slideshare.png rename to tests/output/custom/theme/images/icons/slideshare.png diff --git a/pelican/tests/output/custom/theme/images/icons/speakerdeck.png b/tests/output/custom/theme/images/icons/speakerdeck.png similarity index 100% rename from pelican/tests/output/custom/theme/images/icons/speakerdeck.png rename to tests/output/custom/theme/images/icons/speakerdeck.png diff --git a/pelican/tests/output/custom/theme/images/icons/stackoverflow.png b/tests/output/custom/theme/images/icons/stackoverflow.png similarity index 100% rename from pelican/tests/output/custom/theme/images/icons/stackoverflow.png rename to tests/output/custom/theme/images/icons/stackoverflow.png diff --git a/pelican/tests/output/custom/theme/images/icons/twitter.png b/tests/output/custom/theme/images/icons/twitter.png similarity index 100% rename from pelican/tests/output/custom/theme/images/icons/twitter.png rename to tests/output/custom/theme/images/icons/twitter.png diff --git a/pelican/tests/output/custom/theme/images/icons/vimeo.png b/tests/output/custom/theme/images/icons/vimeo.png similarity index 100% rename from pelican/tests/output/custom/theme/images/icons/vimeo.png rename to tests/output/custom/theme/images/icons/vimeo.png diff --git a/pelican/tests/output/custom/theme/images/icons/youtube.png b/tests/output/custom/theme/images/icons/youtube.png similarity index 100% rename from pelican/tests/output/custom/theme/images/icons/youtube.png rename to tests/output/custom/theme/images/icons/youtube.png diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/tests/output/custom/this-is-a-super-article.html similarity index 100% rename from pelican/tests/output/custom/this-is-a-super-article.html rename to tests/output/custom/this-is-a-super-article.html diff --git a/pelican/tests/output/custom/unbelievable.html b/tests/output/custom/unbelievable.html similarity index 100% rename from pelican/tests/output/custom/unbelievable.html rename to tests/output/custom/unbelievable.html diff --git a/pelican/tests/output/custom_locale/archives.html b/tests/output/custom_locale/archives.html similarity index 100% rename from pelican/tests/output/custom_locale/archives.html rename to tests/output/custom_locale/archives.html diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/tests/output/custom_locale/author/alexis-metaireau.html similarity index 100% rename from pelican/tests/output/custom_locale/author/alexis-metaireau.html rename to tests/output/custom_locale/author/alexis-metaireau.html diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/tests/output/custom_locale/author/alexis-metaireau2.html similarity index 100% rename from pelican/tests/output/custom_locale/author/alexis-metaireau2.html rename to tests/output/custom_locale/author/alexis-metaireau2.html diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/tests/output/custom_locale/author/alexis-metaireau3.html similarity index 100% rename from pelican/tests/output/custom_locale/author/alexis-metaireau3.html rename to tests/output/custom_locale/author/alexis-metaireau3.html diff --git a/pelican/tests/output/custom_locale/authors.html b/tests/output/custom_locale/authors.html similarity index 100% rename from pelican/tests/output/custom_locale/authors.html rename to tests/output/custom_locale/authors.html diff --git a/pelican/tests/output/custom_locale/categories.html b/tests/output/custom_locale/categories.html similarity index 100% rename from pelican/tests/output/custom_locale/categories.html rename to tests/output/custom_locale/categories.html diff --git a/pelican/tests/output/custom_locale/category/bar.html b/tests/output/custom_locale/category/bar.html similarity index 100% rename from pelican/tests/output/custom_locale/category/bar.html rename to tests/output/custom_locale/category/bar.html diff --git a/pelican/tests/output/custom_locale/category/cat1.html b/tests/output/custom_locale/category/cat1.html similarity index 100% rename from pelican/tests/output/custom_locale/category/cat1.html rename to tests/output/custom_locale/category/cat1.html diff --git a/pelican/tests/output/custom_locale/category/misc.html b/tests/output/custom_locale/category/misc.html similarity index 100% rename from pelican/tests/output/custom_locale/category/misc.html rename to tests/output/custom_locale/category/misc.html diff --git a/pelican/tests/output/custom_locale/category/yeah.html b/tests/output/custom_locale/category/yeah.html similarity index 100% rename from pelican/tests/output/custom_locale/category/yeah.html rename to tests/output/custom_locale/category/yeah.html diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article.html b/tests/output/custom_locale/drafts/a-draft-article.html similarity index 100% rename from pelican/tests/output/custom_locale/drafts/a-draft-article.html rename to tests/output/custom_locale/drafts/a-draft-article.html diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml similarity index 100% rename from pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml rename to tests/output/custom_locale/feeds/alexis-metaireau.atom.xml diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml b/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml similarity index 100% rename from pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml rename to tests/output/custom_locale/feeds/alexis-metaireau.rss.xml diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/tests/output/custom_locale/feeds/all-en.atom.xml similarity index 100% rename from pelican/tests/output/custom_locale/feeds/all-en.atom.xml rename to tests/output/custom_locale/feeds/all-en.atom.xml diff --git a/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml b/tests/output/custom_locale/feeds/all-fr.atom.xml similarity index 100% rename from pelican/tests/output/custom_locale/feeds/all-fr.atom.xml rename to tests/output/custom_locale/feeds/all-fr.atom.xml diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/tests/output/custom_locale/feeds/all.atom.xml similarity index 100% rename from pelican/tests/output/custom_locale/feeds/all.atom.xml rename to tests/output/custom_locale/feeds/all.atom.xml diff --git a/pelican/tests/output/custom_locale/feeds/all.rss.xml b/tests/output/custom_locale/feeds/all.rss.xml similarity index 100% rename from pelican/tests/output/custom_locale/feeds/all.rss.xml rename to tests/output/custom_locale/feeds/all.rss.xml diff --git a/pelican/tests/output/custom_locale/feeds/bar.atom.xml b/tests/output/custom_locale/feeds/bar.atom.xml similarity index 100% rename from pelican/tests/output/custom_locale/feeds/bar.atom.xml rename to tests/output/custom_locale/feeds/bar.atom.xml diff --git a/pelican/tests/output/custom_locale/feeds/bar.rss.xml b/tests/output/custom_locale/feeds/bar.rss.xml similarity index 100% rename from pelican/tests/output/custom_locale/feeds/bar.rss.xml rename to tests/output/custom_locale/feeds/bar.rss.xml diff --git a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml b/tests/output/custom_locale/feeds/cat1.atom.xml similarity index 100% rename from pelican/tests/output/custom_locale/feeds/cat1.atom.xml rename to tests/output/custom_locale/feeds/cat1.atom.xml diff --git a/pelican/tests/output/custom_locale/feeds/cat1.rss.xml b/tests/output/custom_locale/feeds/cat1.rss.xml similarity index 100% rename from pelican/tests/output/custom_locale/feeds/cat1.rss.xml rename to tests/output/custom_locale/feeds/cat1.rss.xml diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/tests/output/custom_locale/feeds/misc.atom.xml similarity index 100% rename from pelican/tests/output/custom_locale/feeds/misc.atom.xml rename to tests/output/custom_locale/feeds/misc.atom.xml diff --git a/pelican/tests/output/custom_locale/feeds/misc.rss.xml b/tests/output/custom_locale/feeds/misc.rss.xml similarity index 100% rename from pelican/tests/output/custom_locale/feeds/misc.rss.xml rename to tests/output/custom_locale/feeds/misc.rss.xml diff --git a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml b/tests/output/custom_locale/feeds/yeah.atom.xml similarity index 100% rename from pelican/tests/output/custom_locale/feeds/yeah.atom.xml rename to tests/output/custom_locale/feeds/yeah.atom.xml diff --git a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml b/tests/output/custom_locale/feeds/yeah.rss.xml similarity index 100% rename from pelican/tests/output/custom_locale/feeds/yeah.rss.xml rename to tests/output/custom_locale/feeds/yeah.rss.xml diff --git a/pelican/tests/output/custom_locale/index.html b/tests/output/custom_locale/index.html similarity index 100% rename from pelican/tests/output/custom_locale/index.html rename to tests/output/custom_locale/index.html diff --git a/pelican/tests/output/custom_locale/index2.html b/tests/output/custom_locale/index2.html similarity index 100% rename from pelican/tests/output/custom_locale/index2.html rename to tests/output/custom_locale/index2.html diff --git a/pelican/tests/output/custom_locale/index3.html b/tests/output/custom_locale/index3.html similarity index 100% rename from pelican/tests/output/custom_locale/index3.html rename to tests/output/custom_locale/index3.html diff --git a/pelican/tests/output/custom_locale/jinja2_template.html b/tests/output/custom_locale/jinja2_template.html similarity index 100% rename from pelican/tests/output/custom_locale/jinja2_template.html rename to tests/output/custom_locale/jinja2_template.html diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/tests/output/custom_locale/oh-yeah-fr.html similarity index 100% rename from pelican/tests/output/custom_locale/oh-yeah-fr.html rename to tests/output/custom_locale/oh-yeah-fr.html diff --git a/pelican/tests/output/custom_locale/override/index.html b/tests/output/custom_locale/override/index.html similarity index 100% rename from pelican/tests/output/custom_locale/override/index.html rename to tests/output/custom_locale/override/index.html diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html b/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html similarity index 100% rename from pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html rename to tests/output/custom_locale/pages/this-is-a-test-hidden-page.html diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html b/tests/output/custom_locale/pages/this-is-a-test-page.html similarity index 100% rename from pelican/tests/output/custom_locale/pages/this-is-a-test-page.html rename to tests/output/custom_locale/pages/this-is-a-test-page.html diff --git a/pelican/tests/output/custom_locale/pictures/Fat_Cat.jpg b/tests/output/custom_locale/pictures/Fat_Cat.jpg similarity index 100% rename from pelican/tests/output/custom_locale/pictures/Fat_Cat.jpg rename to tests/output/custom_locale/pictures/Fat_Cat.jpg diff --git a/pelican/tests/output/custom_locale/pictures/Sushi.jpg b/tests/output/custom_locale/pictures/Sushi.jpg similarity index 100% rename from pelican/tests/output/custom_locale/pictures/Sushi.jpg rename to tests/output/custom_locale/pictures/Sushi.jpg diff --git a/pelican/tests/output/custom_locale/pictures/Sushi_Macro.jpg b/tests/output/custom_locale/pictures/Sushi_Macro.jpg similarity index 100% rename from pelican/tests/output/custom_locale/pictures/Sushi_Macro.jpg rename to tests/output/custom_locale/pictures/Sushi_Macro.jpg diff --git a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html b/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html similarity index 100% rename from pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html rename to tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html similarity index 100% rename from pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html rename to tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html b/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html similarity index 100% rename from pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html rename to tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html diff --git a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html b/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html similarity index 100% rename from pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html rename to tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html b/tests/output/custom_locale/posts/2011/février/17/article-1/index.html similarity index 100% rename from pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html rename to tests/output/custom_locale/posts/2011/février/17/article-1/index.html diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html b/tests/output/custom_locale/posts/2011/février/17/article-2/index.html similarity index 100% rename from pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html rename to tests/output/custom_locale/posts/2011/février/17/article-2/index.html diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html b/tests/output/custom_locale/posts/2011/février/17/article-3/index.html similarity index 100% rename from pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html rename to tests/output/custom_locale/posts/2011/février/17/article-3/index.html diff --git a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html b/tests/output/custom_locale/posts/2012/février/29/second-article/index.html similarity index 100% rename from pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html rename to tests/output/custom_locale/posts/2012/février/29/second-article/index.html diff --git a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html b/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html similarity index 100% rename from pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html rename to tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html diff --git a/pelican/tests/output/custom_locale/robots.txt b/tests/output/custom_locale/robots.txt similarity index 100% rename from pelican/tests/output/custom_locale/robots.txt rename to tests/output/custom_locale/robots.txt diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/tests/output/custom_locale/second-article-fr.html similarity index 100% rename from pelican/tests/output/custom_locale/second-article-fr.html rename to tests/output/custom_locale/second-article-fr.html diff --git a/pelican/tests/output/custom_locale/tag/bar.html b/tests/output/custom_locale/tag/bar.html similarity index 100% rename from pelican/tests/output/custom_locale/tag/bar.html rename to tests/output/custom_locale/tag/bar.html diff --git a/pelican/tests/output/custom_locale/tag/baz.html b/tests/output/custom_locale/tag/baz.html similarity index 100% rename from pelican/tests/output/custom_locale/tag/baz.html rename to tests/output/custom_locale/tag/baz.html diff --git a/pelican/tests/output/custom_locale/tag/foo.html b/tests/output/custom_locale/tag/foo.html similarity index 100% rename from pelican/tests/output/custom_locale/tag/foo.html rename to tests/output/custom_locale/tag/foo.html diff --git a/pelican/tests/output/custom_locale/tag/foobar.html b/tests/output/custom_locale/tag/foobar.html similarity index 100% rename from pelican/tests/output/custom_locale/tag/foobar.html rename to tests/output/custom_locale/tag/foobar.html diff --git a/pelican/tests/output/custom_locale/tag/oh.html b/tests/output/custom_locale/tag/oh.html similarity index 100% rename from pelican/tests/output/custom_locale/tag/oh.html rename to tests/output/custom_locale/tag/oh.html diff --git a/pelican/tests/output/custom_locale/tag/yeah.html b/tests/output/custom_locale/tag/yeah.html similarity index 100% rename from pelican/tests/output/custom_locale/tag/yeah.html rename to tests/output/custom_locale/tag/yeah.html diff --git a/pelican/tests/output/custom_locale/tags.html b/tests/output/custom_locale/tags.html similarity index 100% rename from pelican/tests/output/custom_locale/tags.html rename to tests/output/custom_locale/tags.html diff --git a/pelican/tests/output/custom_locale/theme/css/main.css b/tests/output/custom_locale/theme/css/main.css similarity index 100% rename from pelican/tests/output/custom_locale/theme/css/main.css rename to tests/output/custom_locale/theme/css/main.css diff --git a/pelican/tests/output/custom_locale/theme/css/pygment.css b/tests/output/custom_locale/theme/css/pygment.css similarity index 100% rename from pelican/tests/output/custom_locale/theme/css/pygment.css rename to tests/output/custom_locale/theme/css/pygment.css diff --git a/pelican/tests/output/custom_locale/theme/css/reset.css b/tests/output/custom_locale/theme/css/reset.css similarity index 100% rename from pelican/tests/output/custom_locale/theme/css/reset.css rename to tests/output/custom_locale/theme/css/reset.css diff --git a/pelican/tests/output/custom_locale/theme/css/typogrify.css b/tests/output/custom_locale/theme/css/typogrify.css similarity index 100% rename from pelican/tests/output/custom_locale/theme/css/typogrify.css rename to tests/output/custom_locale/theme/css/typogrify.css diff --git a/pelican/tests/output/custom_locale/theme/css/wide.css b/tests/output/custom_locale/theme/css/wide.css similarity index 100% rename from pelican/tests/output/custom_locale/theme/css/wide.css rename to tests/output/custom_locale/theme/css/wide.css diff --git a/pelican/tests/output/custom_locale/theme/images/icons/aboutme.png b/tests/output/custom_locale/theme/images/icons/aboutme.png similarity index 100% rename from pelican/tests/output/custom_locale/theme/images/icons/aboutme.png rename to tests/output/custom_locale/theme/images/icons/aboutme.png diff --git a/pelican/tests/output/custom_locale/theme/images/icons/bitbucket.png b/tests/output/custom_locale/theme/images/icons/bitbucket.png similarity index 100% rename from pelican/tests/output/custom_locale/theme/images/icons/bitbucket.png rename to tests/output/custom_locale/theme/images/icons/bitbucket.png diff --git a/pelican/tests/output/custom_locale/theme/images/icons/delicious.png b/tests/output/custom_locale/theme/images/icons/delicious.png similarity index 100% rename from pelican/tests/output/custom_locale/theme/images/icons/delicious.png rename to tests/output/custom_locale/theme/images/icons/delicious.png diff --git a/pelican/tests/output/custom_locale/theme/images/icons/facebook.png b/tests/output/custom_locale/theme/images/icons/facebook.png similarity index 100% rename from pelican/tests/output/custom_locale/theme/images/icons/facebook.png rename to tests/output/custom_locale/theme/images/icons/facebook.png diff --git a/pelican/tests/output/custom_locale/theme/images/icons/github.png b/tests/output/custom_locale/theme/images/icons/github.png similarity index 100% rename from pelican/tests/output/custom_locale/theme/images/icons/github.png rename to tests/output/custom_locale/theme/images/icons/github.png diff --git a/pelican/tests/output/custom_locale/theme/images/icons/gitorious.png b/tests/output/custom_locale/theme/images/icons/gitorious.png similarity index 100% rename from pelican/tests/output/custom_locale/theme/images/icons/gitorious.png rename to tests/output/custom_locale/theme/images/icons/gitorious.png diff --git a/pelican/tests/output/custom_locale/theme/images/icons/gittip.png b/tests/output/custom_locale/theme/images/icons/gittip.png similarity index 100% rename from pelican/tests/output/custom_locale/theme/images/icons/gittip.png rename to tests/output/custom_locale/theme/images/icons/gittip.png diff --git a/pelican/tests/output/custom_locale/theme/images/icons/google-groups.png b/tests/output/custom_locale/theme/images/icons/google-groups.png similarity index 100% rename from pelican/tests/output/custom_locale/theme/images/icons/google-groups.png rename to tests/output/custom_locale/theme/images/icons/google-groups.png diff --git a/pelican/tests/output/custom_locale/theme/images/icons/google-plus.png b/tests/output/custom_locale/theme/images/icons/google-plus.png similarity index 100% rename from pelican/tests/output/custom_locale/theme/images/icons/google-plus.png rename to tests/output/custom_locale/theme/images/icons/google-plus.png diff --git a/pelican/tests/output/custom_locale/theme/images/icons/hackernews.png b/tests/output/custom_locale/theme/images/icons/hackernews.png similarity index 100% rename from pelican/tests/output/custom_locale/theme/images/icons/hackernews.png rename to tests/output/custom_locale/theme/images/icons/hackernews.png diff --git a/pelican/tests/output/custom_locale/theme/images/icons/lastfm.png b/tests/output/custom_locale/theme/images/icons/lastfm.png similarity index 100% rename from pelican/tests/output/custom_locale/theme/images/icons/lastfm.png rename to tests/output/custom_locale/theme/images/icons/lastfm.png diff --git a/pelican/tests/output/custom_locale/theme/images/icons/linkedin.png b/tests/output/custom_locale/theme/images/icons/linkedin.png similarity index 100% rename from pelican/tests/output/custom_locale/theme/images/icons/linkedin.png rename to tests/output/custom_locale/theme/images/icons/linkedin.png diff --git a/pelican/tests/output/custom_locale/theme/images/icons/reddit.png b/tests/output/custom_locale/theme/images/icons/reddit.png similarity index 100% rename from pelican/tests/output/custom_locale/theme/images/icons/reddit.png rename to tests/output/custom_locale/theme/images/icons/reddit.png diff --git a/pelican/tests/output/custom_locale/theme/images/icons/rss.png b/tests/output/custom_locale/theme/images/icons/rss.png similarity index 100% rename from pelican/tests/output/custom_locale/theme/images/icons/rss.png rename to tests/output/custom_locale/theme/images/icons/rss.png diff --git a/pelican/tests/output/custom_locale/theme/images/icons/slideshare.png b/tests/output/custom_locale/theme/images/icons/slideshare.png similarity index 100% rename from pelican/tests/output/custom_locale/theme/images/icons/slideshare.png rename to tests/output/custom_locale/theme/images/icons/slideshare.png diff --git a/pelican/tests/output/custom_locale/theme/images/icons/speakerdeck.png b/tests/output/custom_locale/theme/images/icons/speakerdeck.png similarity index 100% rename from pelican/tests/output/custom_locale/theme/images/icons/speakerdeck.png rename to tests/output/custom_locale/theme/images/icons/speakerdeck.png diff --git a/pelican/tests/output/custom_locale/theme/images/icons/stackoverflow.png b/tests/output/custom_locale/theme/images/icons/stackoverflow.png similarity index 100% rename from pelican/tests/output/custom_locale/theme/images/icons/stackoverflow.png rename to tests/output/custom_locale/theme/images/icons/stackoverflow.png diff --git a/pelican/tests/output/custom_locale/theme/images/icons/twitter.png b/tests/output/custom_locale/theme/images/icons/twitter.png similarity index 100% rename from pelican/tests/output/custom_locale/theme/images/icons/twitter.png rename to tests/output/custom_locale/theme/images/icons/twitter.png diff --git a/pelican/tests/output/custom_locale/theme/images/icons/vimeo.png b/tests/output/custom_locale/theme/images/icons/vimeo.png similarity index 100% rename from pelican/tests/output/custom_locale/theme/images/icons/vimeo.png rename to tests/output/custom_locale/theme/images/icons/vimeo.png diff --git a/pelican/tests/output/custom_locale/theme/images/icons/youtube.png b/tests/output/custom_locale/theme/images/icons/youtube.png similarity index 100% rename from pelican/tests/output/custom_locale/theme/images/icons/youtube.png rename to tests/output/custom_locale/theme/images/icons/youtube.png diff --git a/pelican/tests/support.py b/tests/support.py similarity index 100% rename from pelican/tests/support.py rename to tests/support.py diff --git a/pelican/tests/test_contents.py b/tests/test_contents.py similarity index 99% rename from pelican/tests/test_contents.py rename to tests/test_contents.py index 004d512e..0f6f3de7 100644 --- a/pelican/tests/test_contents.py +++ b/tests/test_contents.py @@ -6,7 +6,7 @@ from sys import platform import locale import os.path -from pelican.tests.support import unittest, get_settings +from tests.support import unittest, get_settings from pelican.contents import Page, Article, Static, URLWrapper, Author, Category from pelican.settings import DEFAULT_CONFIG @@ -136,7 +136,7 @@ class TestPage(unittest.TestCase): page = Page(**page_kwargs) # page.locale_date is a unicode string in both python2 and python3 - dt_date = dt.strftime(DEFAULT_CONFIG['DEFAULT_DATE_FORMAT']) + dt_date = dt.strftime(DEFAULT_CONFIG['DEFAULT_DATE_FORMAT']) # dt_date is a byte string in python2, and a unicode string in python3 # Let's make sure it is a unicode string (relies on python 3.3 supporting the u prefix) if type(dt_date) != type(u''): diff --git a/pelican/tests/test_generators.py b/tests/test_generators.py similarity index 99% rename from pelican/tests/test_generators.py rename to tests/test_generators.py index acf767f2..bc72b0e6 100644 --- a/pelican/tests/test_generators.py +++ b/tests/test_generators.py @@ -13,7 +13,7 @@ from tempfile import mkdtemp from pelican.generators import (Generator, ArticlesGenerator, PagesGenerator, StaticGenerator, TemplatePagesGenerator) from pelican.writers import Writer -from pelican.tests.support import unittest, get_settings +from tests.support import unittest, get_settings import locale CUR_DIR = os.path.dirname(__file__) diff --git a/pelican/tests/test_importer.py b/tests/test_importer.py similarity index 99% rename from pelican/tests/test_importer.py rename to tests/test_importer.py index c108bc52..faf284fd 100644 --- a/pelican/tests/test_importer.py +++ b/tests/test_importer.py @@ -7,7 +7,7 @@ import re import locale from codecs import open from pelican.tools.pelican_import import wp2fields, fields2pelican, decode_wp_content, build_header, build_markdown_header, get_attachments, download_attachments -from pelican.tests.support import (unittest, temporary_folder, mute, +from tests.support import (unittest, temporary_folder, mute, skipIfNoExecutable) from pelican.utils import slugify, path_to_file_url diff --git a/pelican/tests/test_paginator.py b/tests/test_paginator.py similarity index 96% rename from pelican/tests/test_paginator.py rename to tests/test_paginator.py index 002d9e07..f13af52c 100644 --- a/pelican/tests/test_paginator.py +++ b/tests/test_paginator.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals, absolute_import import locale -from pelican.tests.support import unittest, get_settings +from tests.support import unittest, get_settings from pelican.paginator import Paginator from pelican.contents import Article, Author diff --git a/pelican/tests/test_pelican.py b/tests/test_pelican.py similarity index 98% rename from pelican/tests/test_pelican.py rename to tests/test_pelican.py index c6332487..f978452a 100644 --- a/pelican/tests/test_pelican.py +++ b/tests/test_pelican.py @@ -13,11 +13,11 @@ import subprocess from pelican import Pelican from pelican.generators import StaticGenerator from pelican.settings import read_settings -from pelican.tests.support import LoggedTestCase, mute, locale_available, unittest +from tests.support import LoggedTestCase, mute, locale_available, unittest CURRENT_DIR = os.path.dirname(os.path.abspath(__file__)) SAMPLES_PATH = os.path.abspath(os.path.join( - CURRENT_DIR, os.pardir, os.pardir, 'samples')) + CURRENT_DIR, os.pardir, 'samples')) OUTPUT_PATH = os.path.abspath(os.path.join(CURRENT_DIR, 'output')) INPUT_PATH = os.path.join(SAMPLES_PATH, "content") diff --git a/pelican/tests/test_readers.py b/tests/test_readers.py similarity index 99% rename from pelican/tests/test_readers.py rename to tests/test_readers.py index cb657673..1b2f364f 100644 --- a/pelican/tests/test_readers.py +++ b/tests/test_readers.py @@ -5,7 +5,7 @@ import os from pelican import readers from pelican.utils import SafeDatetime -from pelican.tests.support import unittest, get_settings +from tests.support import unittest, get_settings CUR_DIR = os.path.dirname(__file__) CONTENT_PATH = os.path.join(CUR_DIR, 'content') diff --git a/pelican/tests/test_rstdirectives.py b/tests/test_rstdirectives.py similarity index 96% rename from pelican/tests/test_rstdirectives.py rename to tests/test_rstdirectives.py index ae863b30..d1a432fd 100644 --- a/pelican/tests/test_rstdirectives.py +++ b/tests/test_rstdirectives.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals, print_function from mock import Mock -from pelican.tests.support import unittest +from tests.support import unittest class Test_abbr_role(unittest.TestCase): def call_it(self, text): diff --git a/pelican/tests/test_settings.py b/tests/test_settings.py similarity index 99% rename from pelican/tests/test_settings.py rename to tests/test_settings.py index db9fee7b..205aeeed 100644 --- a/pelican/tests/test_settings.py +++ b/tests/test_settings.py @@ -8,7 +8,7 @@ from os.path import dirname, abspath, join from pelican.settings import (read_settings, configure_settings, DEFAULT_CONFIG, DEFAULT_THEME) -from pelican.tests.support import unittest +from tests.support import unittest class TestSettingsConfiguration(unittest.TestCase): diff --git a/pelican/tests/test_utils.py b/tests/test_utils.py similarity index 99% rename from pelican/tests/test_utils.py rename to tests/test_utils.py index c6550459..b3b8e830 100644 --- a/pelican/tests/test_utils.py +++ b/tests/test_utils.py @@ -14,7 +14,7 @@ from pelican.generators import TemplatePagesGenerator from pelican.writers import Writer from pelican.settings import read_settings from pelican import utils -from pelican.tests.support import get_article, LoggedTestCase, locale_available, unittest +from tests.support import get_article, LoggedTestCase, locale_available, unittest class TestUtils(LoggedTestCase): diff --git a/tox.ini b/tox.ini index 5dd36c36..fbb4f7e4 100644 --- a/tox.ini +++ b/tox.ini @@ -1,4 +1,4 @@ -# This tests the unified codebase (py27, py33) of Pelican. +# This tests the unified codebase (py27, py33, p34) of Pelican. # depends on some external libraries that aren't released yet. [tox] @@ -6,6 +6,9 @@ envlist = py27,py33,py34 [testenv] commands = - python -m unittest discover + py.test tests deps = -rdev_requirements.txt + +[pytest] +addopts = -vvl