From 197e078a8e0512db28860a2131b24726a3296c5c Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 27 Aug 2012 18:40:02 +0200
Subject: [PATCH 1/2] avoid repeatition in the functional tests

---
 tests/test_pelican.py | 59 +++++++++++++------------------------------
 1 file changed, 17 insertions(+), 42 deletions(-)

diff --git a/tests/test_pelican.py b/tests/test_pelican.py
index 15088ed0b..1f2757d0b 100644
--- a/tests/test_pelican.py
+++ b/tests/test_pelican.py
@@ -35,6 +35,21 @@ def tearDown(self):
         rmtree(self.temp_path)
         locale.setlocale(locale.LC_ALL, self.old_locale)
 
+    def assertFilesEqual(self, diff, left=True, right=True):
+        msg = "some generated " \
+              "files are absent from the expected functional " \
+              "tests output.\n" \
+              "This is probably because the HTML generated files " \
+              "changed. If these changes are normal, please refer " \
+              "to docs/contribute.rst to update the expected " \
+              "output of the functional tests."
+
+        if left:
+            self.assertEqual(diff.left_only, [], msg=msg)
+        if right:
+            self.assertEqual(diff.right_only, [], msg=msg)
+        self.assertEqual(diff.diff_files, [], msg=msg)
+
     @unittest.skip("Test failing")
     def test_basic_generation_works(self):
         # when running pelican without settings, it should pick up the default
@@ -47,27 +62,7 @@ def test_basic_generation_works(self):
             pelican.run()
             diff = dircmp(
                     self.temp_path, os.sep.join((OUTPUT_PATH, "basic")))
-            self.assertEqual(diff.left_only, [], msg="some generated " \
-                    "files are absent from the expected functional " \
-                    "tests output.\n" \
-                    "This is probably because the HTML generated files " \
-                    "changed. If these changes are normal, please refer " \
-                    "to docs/contribute.rst to update the expected " \
-                    "output of the functional tests.")
-            self.assertEqual(diff.right_only, [], msg="some files from " \
-                    "the expected functional tests output are absent " \
-                    "from the current output.\n" \
-                    "This is probably because the HTML generated files " \
-                    "changed. If these changes are normal, please refer " \
-                    "to docs/contribute.rst to update the expected " \
-                    "output of the functional tests.")
-            self.assertEqual(diff.diff_files, [], msg="some generated " \
-                    "files differ from the expected functional tests " \
-                    "output.\n" \
-                    "This is probably because the HTML generated files " \
-                    "changed. If these changes are normal, please refer " \
-                    "to docs/contribute.rst to update the expected " \
-                    "output of the functional tests.")
+            self.assertFilesEqual(diff, left=False)
 
     def test_custom_generation_works(self):
         # the same thing with a specified set of settings should work
@@ -75,24 +70,4 @@ def test_custom_generation_works(self):
                             settings=read_settings(SAMPLE_CONFIG))
         pelican.run()
         diff = dircmp(self.temp_path, os.sep.join((OUTPUT_PATH, "custom")))
-        self.assertEqual(diff.left_only, [], msg="some generated " \
-                "files are absent from the expected functional " \
-                "tests output.\n" \
-                "This is probably because the HTML generated files " \
-                "changed. If these changes are normal, please refer " \
-                "to docs/contribute.rst to update the expected " \
-                "output of the functional tests.")
-        self.assertEqual(diff.right_only, [], msg="some files from " \
-                "the expected functional tests output are absent " \
-                "from the current output.\n" \
-                "This is probably because the HTML generated files " \
-                "changed. If these changes are normal, please refer " \
-                "to docs/contribute.rst to update the expected " \
-                "output of the functional tests.")
-        self.assertEqual(diff.diff_files, [], msg="some generated " \
-                "files differ from the expected functional tests " \
-                "output.\n" \
-                "This is probably because the HTML generated files " \
-                "changed. If these changes are normal, please refer " \
-                "to docs/contribute.rst to update the expected " \
-                "output of the functional tests.")
+        self.assertFilesEqual(diff)

From 3376a4870b7f80d6aeef7df369adb457770f6630 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 2 Sep 2012 14:20:52 +0200
Subject: [PATCH 2/2] Move the test suite inside pelican python module, as
 pelican.tests.

---
 .travis.yml                                         |   2 +-
 MANIFEST.in                                         |   5 +++--
 {tests => pelican/tests}/TestPages/bad_page.rst     |   0
 {tests => pelican/tests}/TestPages/hidden_page.rst  |   0
 .../tests}/TestPages/hidden_page_markdown.md        |   0
 .../tests}/TestPages/hidden_page_with_template.rst  |   0
 {tests => pelican/tests}/TestPages/page.rst         |   0
 {tests => pelican/tests}/TestPages/page_markdown.md |   0
 .../tests}/TestPages/page_with_template.rst         |   0
 {tests => pelican/tests}/__init__.py                |   0
 .../content/TestCategory/article_with_category.rst  |   0
 .../TestCategory/article_without_category.rst       |   0
 {tests => pelican/tests}/content/article.rst        |   0
 .../tests}/content/article_with_md_extension.md     |   0
 .../tests}/content/article_with_metadata.rst        |   0
 .../tests}/content/article_with_mkd_extension.mkd   |   0
 .../tests}/content/article_with_template.rst        |   0
 .../content/article_with_uppercase_metadata.rst     |   0
 .../tests}/content/article_without_category.rst     |   0
 .../tests}/content/wordpressexport.xml              |   0
 {tests => pelican/tests}/default_conf.py            |   0
 .../output/basic/a-markdown-powered-article.html    |   0
 {tests => pelican/tests}/output/basic/archives.html |   0
 .../tests}/output/basic/article-1.html              |   0
 .../tests}/output/basic/article-2.html              |   0
 .../tests}/output/basic/article-3.html              |   0
 .../output/basic/author/alexis-metaireau.html       |   0
 .../tests}/output/basic/author/dummy-author.html    |   0
 .../tests}/output/basic/categories.html             |   0
 .../tests}/output/basic/category/bar.html           |   0
 .../tests}/output/basic/category/cat1.html          |   0
 .../tests}/output/basic/category/content.html       |   0
 .../tests}/output/basic/category/misc.html          |   0
 .../tests}/output/basic/category/yeah.html          |   0
 .../tests}/output/basic/drafts/a-draft-article.html |   0
 .../tests}/output/basic/feeds/all-en.atom.xml       |   0
 .../tests}/output/basic/feeds/all-fr.atom.xml       |   0
 .../tests}/output/basic/feeds/all.atom.xml          |   0
 .../tests}/output/basic/feeds/bar.atom.xml          |   0
 .../tests}/output/basic/feeds/cat1.atom.xml         |   0
 .../tests}/output/basic/feeds/content.atom.xml      |   0
 .../tests}/output/basic/feeds/misc.atom.xml         |   0
 .../tests}/output/basic/feeds/yeah.atom.xml         |   0
 {tests => pelican/tests}/output/basic/index.html    |   0
 .../tests}/output/basic/oh-yeah-fr.html             |   0
 {tests => pelican/tests}/output/basic/oh-yeah.html  |   0
 .../basic/pages/this-is-a-test-hidden-page.html     |   0
 .../output/basic/pages/this-is-a-test-page.html     |   0
 .../tests}/output/basic/second-article-fr.html      |   0
 .../tests}/output/basic/second-article.html         |   0
 {tests => pelican/tests}/output/basic/tag/bar.html  |   0
 {tests => pelican/tests}/output/basic/tag/baz.html  |   0
 {tests => pelican/tests}/output/basic/tag/foo.html  |   0
 .../tests}/output/basic/tag/foobar.html             |   0
 {tests => pelican/tests}/output/basic/tag/oh.html   |   0
 {tests => pelican/tests}/output/basic/tag/yeah.html |   0
 {tests => pelican/tests}/output/basic/tags.html     |   0
 .../tests}/output/basic/theme/css/main.css          |   0
 .../tests}/output/basic/theme/css/pygment.css       |   0
 .../tests}/output/basic/theme/css/reset.css         |   0
 .../tests}/output/basic/theme/css/typogrify.css     |   0
 .../tests}/output/basic/theme/css/wide.css          |   0
 .../output/basic/theme/images/icons/delicious.png   | Bin
 .../output/basic/theme/images/icons/facebook.png    | Bin
 .../output/basic/theme/images/icons/gitorious.png   | Bin
 .../output/basic/theme/images/icons/lastfm.png      | Bin
 .../output/basic/theme/images/icons/linkedin.png    | Bin
 .../tests}/output/basic/theme/images/icons/rss.png  | Bin
 .../output/basic/theme/images/icons/twitter.png     | Bin
 .../output/basic/this-is-a-super-article.html       |   0
 .../tests}/output/basic/unbelievable.html           |   0
 .../output/custom/a-markdown-powered-article.html   |   0
 .../tests}/output/custom/archives.html              |   0
 .../tests}/output/custom/article-1.html             |   0
 .../tests}/output/custom/article-2.html             |   0
 .../tests}/output/custom/article-3.html             |   0
 .../output/custom/author/alexis-metaireau.html      |   0
 .../output/custom/author/alexis-metaireau2.html     |   0
 .../tests}/output/custom/categories.html            |   0
 .../tests}/output/custom/category/bar.html          |   0
 .../tests}/output/custom/category/cat1.html         |   0
 .../tests}/output/custom/category/misc.html         |   0
 .../tests}/output/custom/category/yeah.html         |   0
 .../output/custom/drafts/a-draft-article.html       |   0
 .../tests}/output/custom/feeds/all-en.atom.xml      |   0
 .../tests}/output/custom/feeds/all-fr.atom.xml      |   0
 .../tests}/output/custom/feeds/all.atom.xml         |   0
 .../tests}/output/custom/feeds/all.rss.xml          |   0
 .../tests}/output/custom/feeds/bar.atom.xml         |   0
 .../tests}/output/custom/feeds/bar.rss.xml          |   0
 .../tests}/output/custom/feeds/cat1.atom.xml        |   0
 .../tests}/output/custom/feeds/cat1.rss.xml         |   0
 .../tests}/output/custom/feeds/misc.atom.xml        |   0
 .../tests}/output/custom/feeds/misc.rss.xml         |   0
 .../tests}/output/custom/feeds/yeah.atom.xml        |   0
 .../tests}/output/custom/feeds/yeah.rss.xml         |   0
 {tests => pelican/tests}/output/custom/index.html   |   0
 {tests => pelican/tests}/output/custom/index2.html  |   0
 .../tests}/output/custom/oh-yeah-fr.html            |   0
 {tests => pelican/tests}/output/custom/oh-yeah.html |   0
 .../custom/pages/this-is-a-test-hidden-page.html    |   0
 .../output/custom/pages/this-is-a-test-page.html    |   0
 {tests => pelican/tests}/output/custom/robots.txt   |   0
 .../tests}/output/custom/second-article-fr.html     |   0
 .../tests}/output/custom/second-article.html        |   0
 .../output/custom/static/pictures/Fat_Cat.jpg       | Bin
 .../tests}/output/custom/static/pictures/Sushi.jpg  | Bin
 .../output/custom/static/pictures/Sushi_Macro.jpg   | Bin
 {tests => pelican/tests}/output/custom/tag/bar.html |   0
 {tests => pelican/tests}/output/custom/tag/baz.html |   0
 {tests => pelican/tests}/output/custom/tag/foo.html |   0
 .../tests}/output/custom/tag/foobar.html            |   0
 {tests => pelican/tests}/output/custom/tag/oh.html  |   0
 .../tests}/output/custom/tag/yeah.html              |   0
 {tests => pelican/tests}/output/custom/tags.html    |   0
 .../tests}/output/custom/theme/css/main.css         |   0
 .../tests}/output/custom/theme/css/pygment.css      |   0
 .../tests}/output/custom/theme/css/reset.css        |   0
 .../tests}/output/custom/theme/css/typogrify.css    |   0
 .../tests}/output/custom/theme/css/wide.css         |   0
 .../output/custom/theme/images/icons/delicious.png  | Bin
 .../output/custom/theme/images/icons/facebook.png   | Bin
 .../output/custom/theme/images/icons/gitorious.png  | Bin
 .../output/custom/theme/images/icons/lastfm.png     | Bin
 .../output/custom/theme/images/icons/linkedin.png   | Bin
 .../tests}/output/custom/theme/images/icons/rss.png | Bin
 .../output/custom/theme/images/icons/twitter.png    | Bin
 .../output/custom/this-is-a-super-article.html      |   0
 .../tests}/output/custom/unbelievable.html          |   0
 {tests => pelican/tests}/support.py                 |   0
 {tests => pelican/tests}/test_contents.py           |   0
 {tests => pelican/tests}/test_generators.py         |   0
 {tests => pelican/tests}/test_importer.py           |   0
 {tests => pelican/tests}/test_pelican.py            |   3 ++-
 {tests => pelican/tests}/test_readers.py            |   0
 {tests => pelican/tests}/test_settings.py           |   0
 {tests => pelican/tests}/test_utils.py              |   0
 setup.py                                            |   2 +-
 tox.ini                                             |   2 +-
 139 files changed, 8 insertions(+), 6 deletions(-)
 rename {tests => pelican/tests}/TestPages/bad_page.rst (100%)
 rename {tests => pelican/tests}/TestPages/hidden_page.rst (100%)
 rename {tests => pelican/tests}/TestPages/hidden_page_markdown.md (100%)
 rename {tests => pelican/tests}/TestPages/hidden_page_with_template.rst (100%)
 rename {tests => pelican/tests}/TestPages/page.rst (100%)
 rename {tests => pelican/tests}/TestPages/page_markdown.md (100%)
 rename {tests => pelican/tests}/TestPages/page_with_template.rst (100%)
 rename {tests => pelican/tests}/__init__.py (100%)
 rename {tests => pelican/tests}/content/TestCategory/article_with_category.rst (100%)
 rename {tests => pelican/tests}/content/TestCategory/article_without_category.rst (100%)
 rename {tests => pelican/tests}/content/article.rst (100%)
 rename {tests => pelican/tests}/content/article_with_md_extension.md (100%)
 rename {tests => pelican/tests}/content/article_with_metadata.rst (100%)
 rename {tests => pelican/tests}/content/article_with_mkd_extension.mkd (100%)
 rename {tests => pelican/tests}/content/article_with_template.rst (100%)
 rename {tests => pelican/tests}/content/article_with_uppercase_metadata.rst (100%)
 rename {tests => pelican/tests}/content/article_without_category.rst (100%)
 rename {tests => pelican/tests}/content/wordpressexport.xml (100%)
 rename {tests => pelican/tests}/default_conf.py (100%)
 rename {tests => pelican/tests}/output/basic/a-markdown-powered-article.html (100%)
 rename {tests => pelican/tests}/output/basic/archives.html (100%)
 rename {tests => pelican/tests}/output/basic/article-1.html (100%)
 rename {tests => pelican/tests}/output/basic/article-2.html (100%)
 rename {tests => pelican/tests}/output/basic/article-3.html (100%)
 rename {tests => pelican/tests}/output/basic/author/alexis-metaireau.html (100%)
 rename {tests => pelican/tests}/output/basic/author/dummy-author.html (100%)
 rename {tests => pelican/tests}/output/basic/categories.html (100%)
 rename {tests => pelican/tests}/output/basic/category/bar.html (100%)
 rename {tests => pelican/tests}/output/basic/category/cat1.html (100%)
 rename {tests => pelican/tests}/output/basic/category/content.html (100%)
 rename {tests => pelican/tests}/output/basic/category/misc.html (100%)
 rename {tests => pelican/tests}/output/basic/category/yeah.html (100%)
 rename {tests => pelican/tests}/output/basic/drafts/a-draft-article.html (100%)
 rename {tests => pelican/tests}/output/basic/feeds/all-en.atom.xml (100%)
 rename {tests => pelican/tests}/output/basic/feeds/all-fr.atom.xml (100%)
 rename {tests => pelican/tests}/output/basic/feeds/all.atom.xml (100%)
 rename {tests => pelican/tests}/output/basic/feeds/bar.atom.xml (100%)
 rename {tests => pelican/tests}/output/basic/feeds/cat1.atom.xml (100%)
 rename {tests => pelican/tests}/output/basic/feeds/content.atom.xml (100%)
 rename {tests => pelican/tests}/output/basic/feeds/misc.atom.xml (100%)
 rename {tests => pelican/tests}/output/basic/feeds/yeah.atom.xml (100%)
 rename {tests => pelican/tests}/output/basic/index.html (100%)
 rename {tests => pelican/tests}/output/basic/oh-yeah-fr.html (100%)
 rename {tests => pelican/tests}/output/basic/oh-yeah.html (100%)
 rename {tests => pelican/tests}/output/basic/pages/this-is-a-test-hidden-page.html (100%)
 rename {tests => pelican/tests}/output/basic/pages/this-is-a-test-page.html (100%)
 rename {tests => pelican/tests}/output/basic/second-article-fr.html (100%)
 rename {tests => pelican/tests}/output/basic/second-article.html (100%)
 rename {tests => pelican/tests}/output/basic/tag/bar.html (100%)
 rename {tests => pelican/tests}/output/basic/tag/baz.html (100%)
 rename {tests => pelican/tests}/output/basic/tag/foo.html (100%)
 rename {tests => pelican/tests}/output/basic/tag/foobar.html (100%)
 rename {tests => pelican/tests}/output/basic/tag/oh.html (100%)
 rename {tests => pelican/tests}/output/basic/tag/yeah.html (100%)
 rename {tests => pelican/tests}/output/basic/tags.html (100%)
 rename {tests => pelican/tests}/output/basic/theme/css/main.css (100%)
 rename {tests => pelican/tests}/output/basic/theme/css/pygment.css (100%)
 rename {tests => pelican/tests}/output/basic/theme/css/reset.css (100%)
 rename {tests => pelican/tests}/output/basic/theme/css/typogrify.css (100%)
 rename {tests => pelican/tests}/output/basic/theme/css/wide.css (100%)
 rename {tests => pelican/tests}/output/basic/theme/images/icons/delicious.png (100%)
 rename {tests => pelican/tests}/output/basic/theme/images/icons/facebook.png (100%)
 rename {tests => pelican/tests}/output/basic/theme/images/icons/gitorious.png (100%)
 rename {tests => pelican/tests}/output/basic/theme/images/icons/lastfm.png (100%)
 rename {tests => pelican/tests}/output/basic/theme/images/icons/linkedin.png (100%)
 rename {tests => pelican/tests}/output/basic/theme/images/icons/rss.png (100%)
 rename {tests => pelican/tests}/output/basic/theme/images/icons/twitter.png (100%)
 rename {tests => pelican/tests}/output/basic/this-is-a-super-article.html (100%)
 rename {tests => pelican/tests}/output/basic/unbelievable.html (100%)
 rename {tests => pelican/tests}/output/custom/a-markdown-powered-article.html (100%)
 rename {tests => pelican/tests}/output/custom/archives.html (100%)
 rename {tests => pelican/tests}/output/custom/article-1.html (100%)
 rename {tests => pelican/tests}/output/custom/article-2.html (100%)
 rename {tests => pelican/tests}/output/custom/article-3.html (100%)
 rename {tests => pelican/tests}/output/custom/author/alexis-metaireau.html (100%)
 rename {tests => pelican/tests}/output/custom/author/alexis-metaireau2.html (100%)
 rename {tests => pelican/tests}/output/custom/categories.html (100%)
 rename {tests => pelican/tests}/output/custom/category/bar.html (100%)
 rename {tests => pelican/tests}/output/custom/category/cat1.html (100%)
 rename {tests => pelican/tests}/output/custom/category/misc.html (100%)
 rename {tests => pelican/tests}/output/custom/category/yeah.html (100%)
 rename {tests => pelican/tests}/output/custom/drafts/a-draft-article.html (100%)
 rename {tests => pelican/tests}/output/custom/feeds/all-en.atom.xml (100%)
 rename {tests => pelican/tests}/output/custom/feeds/all-fr.atom.xml (100%)
 rename {tests => pelican/tests}/output/custom/feeds/all.atom.xml (100%)
 rename {tests => pelican/tests}/output/custom/feeds/all.rss.xml (100%)
 rename {tests => pelican/tests}/output/custom/feeds/bar.atom.xml (100%)
 rename {tests => pelican/tests}/output/custom/feeds/bar.rss.xml (100%)
 rename {tests => pelican/tests}/output/custom/feeds/cat1.atom.xml (100%)
 rename {tests => pelican/tests}/output/custom/feeds/cat1.rss.xml (100%)
 rename {tests => pelican/tests}/output/custom/feeds/misc.atom.xml (100%)
 rename {tests => pelican/tests}/output/custom/feeds/misc.rss.xml (100%)
 rename {tests => pelican/tests}/output/custom/feeds/yeah.atom.xml (100%)
 rename {tests => pelican/tests}/output/custom/feeds/yeah.rss.xml (100%)
 rename {tests => pelican/tests}/output/custom/index.html (100%)
 rename {tests => pelican/tests}/output/custom/index2.html (100%)
 rename {tests => pelican/tests}/output/custom/oh-yeah-fr.html (100%)
 rename {tests => pelican/tests}/output/custom/oh-yeah.html (100%)
 rename {tests => pelican/tests}/output/custom/pages/this-is-a-test-hidden-page.html (100%)
 rename {tests => pelican/tests}/output/custom/pages/this-is-a-test-page.html (100%)
 rename {tests => pelican/tests}/output/custom/robots.txt (100%)
 rename {tests => pelican/tests}/output/custom/second-article-fr.html (100%)
 rename {tests => pelican/tests}/output/custom/second-article.html (100%)
 rename {tests => pelican/tests}/output/custom/static/pictures/Fat_Cat.jpg (100%)
 rename {tests => pelican/tests}/output/custom/static/pictures/Sushi.jpg (100%)
 rename {tests => pelican/tests}/output/custom/static/pictures/Sushi_Macro.jpg (100%)
 rename {tests => pelican/tests}/output/custom/tag/bar.html (100%)
 rename {tests => pelican/tests}/output/custom/tag/baz.html (100%)
 rename {tests => pelican/tests}/output/custom/tag/foo.html (100%)
 rename {tests => pelican/tests}/output/custom/tag/foobar.html (100%)
 rename {tests => pelican/tests}/output/custom/tag/oh.html (100%)
 rename {tests => pelican/tests}/output/custom/tag/yeah.html (100%)
 rename {tests => pelican/tests}/output/custom/tags.html (100%)
 rename {tests => pelican/tests}/output/custom/theme/css/main.css (100%)
 rename {tests => pelican/tests}/output/custom/theme/css/pygment.css (100%)
 rename {tests => pelican/tests}/output/custom/theme/css/reset.css (100%)
 rename {tests => pelican/tests}/output/custom/theme/css/typogrify.css (100%)
 rename {tests => pelican/tests}/output/custom/theme/css/wide.css (100%)
 rename {tests => pelican/tests}/output/custom/theme/images/icons/delicious.png (100%)
 rename {tests => pelican/tests}/output/custom/theme/images/icons/facebook.png (100%)
 rename {tests => pelican/tests}/output/custom/theme/images/icons/gitorious.png (100%)
 rename {tests => pelican/tests}/output/custom/theme/images/icons/lastfm.png (100%)
 rename {tests => pelican/tests}/output/custom/theme/images/icons/linkedin.png (100%)
 rename {tests => pelican/tests}/output/custom/theme/images/icons/rss.png (100%)
 rename {tests => pelican/tests}/output/custom/theme/images/icons/twitter.png (100%)
 rename {tests => pelican/tests}/output/custom/this-is-a-super-article.html (100%)
 rename {tests => pelican/tests}/output/custom/unbelievable.html (100%)
 rename {tests => pelican/tests}/support.py (100%)
 rename {tests => pelican/tests}/test_contents.py (100%)
 rename {tests => pelican/tests}/test_generators.py (100%)
 rename {tests => pelican/tests}/test_importer.py (100%)
 rename {tests => pelican/tests}/test_pelican.py (97%)
 rename {tests => pelican/tests}/test_readers.py (100%)
 rename {tests => pelican/tests}/test_settings.py (100%)
 rename {tests => pelican/tests}/test_utils.py (100%)

diff --git a/.travis.yml b/.travis.yml
index ea134da41..e7831e13b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ install:
     - pip install nose unittest2 mock --use-mirrors
     - pip install . --use-mirrors
     - pip install Markdown
-script: nosetests -s tests
+script: nosetests -s pelican
 notifications:
     irc:
         channels: 
diff --git a/MANIFEST.in b/MANIFEST.in
index bec6d1a39..e470abaa4 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,5 +2,6 @@ include *.rst
 global-include *.py
 recursive-include pelican *.html *.css *png *.in
 include LICENSE THANKS
-recursive-include tests *
-recursive-exclude tests *.pyc
+recursive-include pelican/tests *
+recursive-exclude pelican/tests *.pyc
+recursive-include samples *
diff --git a/tests/TestPages/bad_page.rst b/pelican/tests/TestPages/bad_page.rst
similarity index 100%
rename from tests/TestPages/bad_page.rst
rename to pelican/tests/TestPages/bad_page.rst
diff --git a/tests/TestPages/hidden_page.rst b/pelican/tests/TestPages/hidden_page.rst
similarity index 100%
rename from tests/TestPages/hidden_page.rst
rename to pelican/tests/TestPages/hidden_page.rst
diff --git a/tests/TestPages/hidden_page_markdown.md b/pelican/tests/TestPages/hidden_page_markdown.md
similarity index 100%
rename from tests/TestPages/hidden_page_markdown.md
rename to pelican/tests/TestPages/hidden_page_markdown.md
diff --git a/tests/TestPages/hidden_page_with_template.rst b/pelican/tests/TestPages/hidden_page_with_template.rst
similarity index 100%
rename from tests/TestPages/hidden_page_with_template.rst
rename to pelican/tests/TestPages/hidden_page_with_template.rst
diff --git a/tests/TestPages/page.rst b/pelican/tests/TestPages/page.rst
similarity index 100%
rename from tests/TestPages/page.rst
rename to pelican/tests/TestPages/page.rst
diff --git a/tests/TestPages/page_markdown.md b/pelican/tests/TestPages/page_markdown.md
similarity index 100%
rename from tests/TestPages/page_markdown.md
rename to pelican/tests/TestPages/page_markdown.md
diff --git a/tests/TestPages/page_with_template.rst b/pelican/tests/TestPages/page_with_template.rst
similarity index 100%
rename from tests/TestPages/page_with_template.rst
rename to pelican/tests/TestPages/page_with_template.rst
diff --git a/tests/__init__.py b/pelican/tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to pelican/tests/__init__.py
diff --git a/tests/content/TestCategory/article_with_category.rst b/pelican/tests/content/TestCategory/article_with_category.rst
similarity index 100%
rename from tests/content/TestCategory/article_with_category.rst
rename to pelican/tests/content/TestCategory/article_with_category.rst
diff --git a/tests/content/TestCategory/article_without_category.rst b/pelican/tests/content/TestCategory/article_without_category.rst
similarity index 100%
rename from tests/content/TestCategory/article_without_category.rst
rename to pelican/tests/content/TestCategory/article_without_category.rst
diff --git a/tests/content/article.rst b/pelican/tests/content/article.rst
similarity index 100%
rename from tests/content/article.rst
rename to pelican/tests/content/article.rst
diff --git a/tests/content/article_with_md_extension.md b/pelican/tests/content/article_with_md_extension.md
similarity index 100%
rename from tests/content/article_with_md_extension.md
rename to pelican/tests/content/article_with_md_extension.md
diff --git a/tests/content/article_with_metadata.rst b/pelican/tests/content/article_with_metadata.rst
similarity index 100%
rename from tests/content/article_with_metadata.rst
rename to pelican/tests/content/article_with_metadata.rst
diff --git a/tests/content/article_with_mkd_extension.mkd b/pelican/tests/content/article_with_mkd_extension.mkd
similarity index 100%
rename from tests/content/article_with_mkd_extension.mkd
rename to pelican/tests/content/article_with_mkd_extension.mkd
diff --git a/tests/content/article_with_template.rst b/pelican/tests/content/article_with_template.rst
similarity index 100%
rename from tests/content/article_with_template.rst
rename to pelican/tests/content/article_with_template.rst
diff --git a/tests/content/article_with_uppercase_metadata.rst b/pelican/tests/content/article_with_uppercase_metadata.rst
similarity index 100%
rename from tests/content/article_with_uppercase_metadata.rst
rename to pelican/tests/content/article_with_uppercase_metadata.rst
diff --git a/tests/content/article_without_category.rst b/pelican/tests/content/article_without_category.rst
similarity index 100%
rename from tests/content/article_without_category.rst
rename to pelican/tests/content/article_without_category.rst
diff --git a/tests/content/wordpressexport.xml b/pelican/tests/content/wordpressexport.xml
similarity index 100%
rename from tests/content/wordpressexport.xml
rename to pelican/tests/content/wordpressexport.xml
diff --git a/tests/default_conf.py b/pelican/tests/default_conf.py
similarity index 100%
rename from tests/default_conf.py
rename to pelican/tests/default_conf.py
diff --git a/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
similarity index 100%
rename from tests/output/basic/a-markdown-powered-article.html
rename to pelican/tests/output/basic/a-markdown-powered-article.html
diff --git a/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
similarity index 100%
rename from tests/output/basic/archives.html
rename to pelican/tests/output/basic/archives.html
diff --git a/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
similarity index 100%
rename from tests/output/basic/article-1.html
rename to pelican/tests/output/basic/article-1.html
diff --git a/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
similarity index 100%
rename from tests/output/basic/article-2.html
rename to pelican/tests/output/basic/article-2.html
diff --git a/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
similarity index 100%
rename from tests/output/basic/article-3.html
rename to pelican/tests/output/basic/article-3.html
diff --git a/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
similarity index 100%
rename from tests/output/basic/author/alexis-metaireau.html
rename to pelican/tests/output/basic/author/alexis-metaireau.html
diff --git a/tests/output/basic/author/dummy-author.html b/pelican/tests/output/basic/author/dummy-author.html
similarity index 100%
rename from tests/output/basic/author/dummy-author.html
rename to pelican/tests/output/basic/author/dummy-author.html
diff --git a/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
similarity index 100%
rename from tests/output/basic/categories.html
rename to pelican/tests/output/basic/categories.html
diff --git a/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
similarity index 100%
rename from tests/output/basic/category/bar.html
rename to pelican/tests/output/basic/category/bar.html
diff --git a/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
similarity index 100%
rename from tests/output/basic/category/cat1.html
rename to pelican/tests/output/basic/category/cat1.html
diff --git a/tests/output/basic/category/content.html b/pelican/tests/output/basic/category/content.html
similarity index 100%
rename from tests/output/basic/category/content.html
rename to pelican/tests/output/basic/category/content.html
diff --git a/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
similarity index 100%
rename from tests/output/basic/category/misc.html
rename to pelican/tests/output/basic/category/misc.html
diff --git a/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
similarity index 100%
rename from tests/output/basic/category/yeah.html
rename to pelican/tests/output/basic/category/yeah.html
diff --git a/tests/output/basic/drafts/a-draft-article.html b/pelican/tests/output/basic/drafts/a-draft-article.html
similarity index 100%
rename from tests/output/basic/drafts/a-draft-article.html
rename to pelican/tests/output/basic/drafts/a-draft-article.html
diff --git a/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
similarity index 100%
rename from tests/output/basic/feeds/all-en.atom.xml
rename to pelican/tests/output/basic/feeds/all-en.atom.xml
diff --git a/tests/output/basic/feeds/all-fr.atom.xml b/pelican/tests/output/basic/feeds/all-fr.atom.xml
similarity index 100%
rename from tests/output/basic/feeds/all-fr.atom.xml
rename to pelican/tests/output/basic/feeds/all-fr.atom.xml
diff --git a/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
similarity index 100%
rename from tests/output/basic/feeds/all.atom.xml
rename to pelican/tests/output/basic/feeds/all.atom.xml
diff --git a/tests/output/basic/feeds/bar.atom.xml b/pelican/tests/output/basic/feeds/bar.atom.xml
similarity index 100%
rename from tests/output/basic/feeds/bar.atom.xml
rename to pelican/tests/output/basic/feeds/bar.atom.xml
diff --git a/tests/output/basic/feeds/cat1.atom.xml b/pelican/tests/output/basic/feeds/cat1.atom.xml
similarity index 100%
rename from tests/output/basic/feeds/cat1.atom.xml
rename to pelican/tests/output/basic/feeds/cat1.atom.xml
diff --git a/tests/output/basic/feeds/content.atom.xml b/pelican/tests/output/basic/feeds/content.atom.xml
similarity index 100%
rename from tests/output/basic/feeds/content.atom.xml
rename to pelican/tests/output/basic/feeds/content.atom.xml
diff --git a/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
similarity index 100%
rename from tests/output/basic/feeds/misc.atom.xml
rename to pelican/tests/output/basic/feeds/misc.atom.xml
diff --git a/tests/output/basic/feeds/yeah.atom.xml b/pelican/tests/output/basic/feeds/yeah.atom.xml
similarity index 100%
rename from tests/output/basic/feeds/yeah.atom.xml
rename to pelican/tests/output/basic/feeds/yeah.atom.xml
diff --git a/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
similarity index 100%
rename from tests/output/basic/index.html
rename to pelican/tests/output/basic/index.html
diff --git a/tests/output/basic/oh-yeah-fr.html b/pelican/tests/output/basic/oh-yeah-fr.html
similarity index 100%
rename from tests/output/basic/oh-yeah-fr.html
rename to pelican/tests/output/basic/oh-yeah-fr.html
diff --git a/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
similarity index 100%
rename from tests/output/basic/oh-yeah.html
rename to pelican/tests/output/basic/oh-yeah.html
diff --git a/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
similarity index 100%
rename from tests/output/basic/pages/this-is-a-test-hidden-page.html
rename to pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
diff --git a/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
similarity index 100%
rename from tests/output/basic/pages/this-is-a-test-page.html
rename to pelican/tests/output/basic/pages/this-is-a-test-page.html
diff --git a/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
similarity index 100%
rename from tests/output/basic/second-article-fr.html
rename to pelican/tests/output/basic/second-article-fr.html
diff --git a/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
similarity index 100%
rename from tests/output/basic/second-article.html
rename to pelican/tests/output/basic/second-article.html
diff --git a/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
similarity index 100%
rename from tests/output/basic/tag/bar.html
rename to pelican/tests/output/basic/tag/bar.html
diff --git a/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
similarity index 100%
rename from tests/output/basic/tag/baz.html
rename to pelican/tests/output/basic/tag/baz.html
diff --git a/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
similarity index 100%
rename from tests/output/basic/tag/foo.html
rename to pelican/tests/output/basic/tag/foo.html
diff --git a/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
similarity index 100%
rename from tests/output/basic/tag/foobar.html
rename to pelican/tests/output/basic/tag/foobar.html
diff --git a/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html
similarity index 100%
rename from tests/output/basic/tag/oh.html
rename to pelican/tests/output/basic/tag/oh.html
diff --git a/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
similarity index 100%
rename from tests/output/basic/tag/yeah.html
rename to pelican/tests/output/basic/tag/yeah.html
diff --git a/tests/output/basic/tags.html b/pelican/tests/output/basic/tags.html
similarity index 100%
rename from tests/output/basic/tags.html
rename to pelican/tests/output/basic/tags.html
diff --git a/tests/output/basic/theme/css/main.css b/pelican/tests/output/basic/theme/css/main.css
similarity index 100%
rename from tests/output/basic/theme/css/main.css
rename to pelican/tests/output/basic/theme/css/main.css
diff --git a/tests/output/basic/theme/css/pygment.css b/pelican/tests/output/basic/theme/css/pygment.css
similarity index 100%
rename from tests/output/basic/theme/css/pygment.css
rename to pelican/tests/output/basic/theme/css/pygment.css
diff --git a/tests/output/basic/theme/css/reset.css b/pelican/tests/output/basic/theme/css/reset.css
similarity index 100%
rename from tests/output/basic/theme/css/reset.css
rename to pelican/tests/output/basic/theme/css/reset.css
diff --git a/tests/output/basic/theme/css/typogrify.css b/pelican/tests/output/basic/theme/css/typogrify.css
similarity index 100%
rename from tests/output/basic/theme/css/typogrify.css
rename to pelican/tests/output/basic/theme/css/typogrify.css
diff --git a/tests/output/basic/theme/css/wide.css b/pelican/tests/output/basic/theme/css/wide.css
similarity index 100%
rename from tests/output/basic/theme/css/wide.css
rename to pelican/tests/output/basic/theme/css/wide.css
diff --git a/tests/output/basic/theme/images/icons/delicious.png b/pelican/tests/output/basic/theme/images/icons/delicious.png
similarity index 100%
rename from tests/output/basic/theme/images/icons/delicious.png
rename to pelican/tests/output/basic/theme/images/icons/delicious.png
diff --git a/tests/output/basic/theme/images/icons/facebook.png b/pelican/tests/output/basic/theme/images/icons/facebook.png
similarity index 100%
rename from tests/output/basic/theme/images/icons/facebook.png
rename to pelican/tests/output/basic/theme/images/icons/facebook.png
diff --git a/tests/output/basic/theme/images/icons/gitorious.png b/pelican/tests/output/basic/theme/images/icons/gitorious.png
similarity index 100%
rename from tests/output/basic/theme/images/icons/gitorious.png
rename to pelican/tests/output/basic/theme/images/icons/gitorious.png
diff --git a/tests/output/basic/theme/images/icons/lastfm.png b/pelican/tests/output/basic/theme/images/icons/lastfm.png
similarity index 100%
rename from tests/output/basic/theme/images/icons/lastfm.png
rename to pelican/tests/output/basic/theme/images/icons/lastfm.png
diff --git a/tests/output/basic/theme/images/icons/linkedin.png b/pelican/tests/output/basic/theme/images/icons/linkedin.png
similarity index 100%
rename from tests/output/basic/theme/images/icons/linkedin.png
rename to pelican/tests/output/basic/theme/images/icons/linkedin.png
diff --git a/tests/output/basic/theme/images/icons/rss.png b/pelican/tests/output/basic/theme/images/icons/rss.png
similarity index 100%
rename from tests/output/basic/theme/images/icons/rss.png
rename to pelican/tests/output/basic/theme/images/icons/rss.png
diff --git a/tests/output/basic/theme/images/icons/twitter.png b/pelican/tests/output/basic/theme/images/icons/twitter.png
similarity index 100%
rename from tests/output/basic/theme/images/icons/twitter.png
rename to pelican/tests/output/basic/theme/images/icons/twitter.png
diff --git a/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
similarity index 100%
rename from tests/output/basic/this-is-a-super-article.html
rename to pelican/tests/output/basic/this-is-a-super-article.html
diff --git a/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
similarity index 100%
rename from tests/output/basic/unbelievable.html
rename to pelican/tests/output/basic/unbelievable.html
diff --git a/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
similarity index 100%
rename from tests/output/custom/a-markdown-powered-article.html
rename to pelican/tests/output/custom/a-markdown-powered-article.html
diff --git a/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
similarity index 100%
rename from tests/output/custom/archives.html
rename to pelican/tests/output/custom/archives.html
diff --git a/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
similarity index 100%
rename from tests/output/custom/article-1.html
rename to pelican/tests/output/custom/article-1.html
diff --git a/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
similarity index 100%
rename from tests/output/custom/article-2.html
rename to pelican/tests/output/custom/article-2.html
diff --git a/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
similarity index 100%
rename from tests/output/custom/article-3.html
rename to pelican/tests/output/custom/article-3.html
diff --git a/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
similarity index 100%
rename from tests/output/custom/author/alexis-metaireau.html
rename to pelican/tests/output/custom/author/alexis-metaireau.html
diff --git a/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
similarity index 100%
rename from tests/output/custom/author/alexis-metaireau2.html
rename to pelican/tests/output/custom/author/alexis-metaireau2.html
diff --git a/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
similarity index 100%
rename from tests/output/custom/categories.html
rename to pelican/tests/output/custom/categories.html
diff --git a/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
similarity index 100%
rename from tests/output/custom/category/bar.html
rename to pelican/tests/output/custom/category/bar.html
diff --git a/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
similarity index 100%
rename from tests/output/custom/category/cat1.html
rename to pelican/tests/output/custom/category/cat1.html
diff --git a/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
similarity index 100%
rename from tests/output/custom/category/misc.html
rename to pelican/tests/output/custom/category/misc.html
diff --git a/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
similarity index 100%
rename from tests/output/custom/category/yeah.html
rename to pelican/tests/output/custom/category/yeah.html
diff --git a/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
similarity index 100%
rename from tests/output/custom/drafts/a-draft-article.html
rename to pelican/tests/output/custom/drafts/a-draft-article.html
diff --git a/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
similarity index 100%
rename from tests/output/custom/feeds/all-en.atom.xml
rename to pelican/tests/output/custom/feeds/all-en.atom.xml
diff --git a/tests/output/custom/feeds/all-fr.atom.xml b/pelican/tests/output/custom/feeds/all-fr.atom.xml
similarity index 100%
rename from tests/output/custom/feeds/all-fr.atom.xml
rename to pelican/tests/output/custom/feeds/all-fr.atom.xml
diff --git a/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
similarity index 100%
rename from tests/output/custom/feeds/all.atom.xml
rename to pelican/tests/output/custom/feeds/all.atom.xml
diff --git a/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
similarity index 100%
rename from tests/output/custom/feeds/all.rss.xml
rename to pelican/tests/output/custom/feeds/all.rss.xml
diff --git a/tests/output/custom/feeds/bar.atom.xml b/pelican/tests/output/custom/feeds/bar.atom.xml
similarity index 100%
rename from tests/output/custom/feeds/bar.atom.xml
rename to pelican/tests/output/custom/feeds/bar.atom.xml
diff --git a/tests/output/custom/feeds/bar.rss.xml b/pelican/tests/output/custom/feeds/bar.rss.xml
similarity index 100%
rename from tests/output/custom/feeds/bar.rss.xml
rename to pelican/tests/output/custom/feeds/bar.rss.xml
diff --git a/tests/output/custom/feeds/cat1.atom.xml b/pelican/tests/output/custom/feeds/cat1.atom.xml
similarity index 100%
rename from tests/output/custom/feeds/cat1.atom.xml
rename to pelican/tests/output/custom/feeds/cat1.atom.xml
diff --git a/tests/output/custom/feeds/cat1.rss.xml b/pelican/tests/output/custom/feeds/cat1.rss.xml
similarity index 100%
rename from tests/output/custom/feeds/cat1.rss.xml
rename to pelican/tests/output/custom/feeds/cat1.rss.xml
diff --git a/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
similarity index 100%
rename from tests/output/custom/feeds/misc.atom.xml
rename to pelican/tests/output/custom/feeds/misc.atom.xml
diff --git a/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
similarity index 100%
rename from tests/output/custom/feeds/misc.rss.xml
rename to pelican/tests/output/custom/feeds/misc.rss.xml
diff --git a/tests/output/custom/feeds/yeah.atom.xml b/pelican/tests/output/custom/feeds/yeah.atom.xml
similarity index 100%
rename from tests/output/custom/feeds/yeah.atom.xml
rename to pelican/tests/output/custom/feeds/yeah.atom.xml
diff --git a/tests/output/custom/feeds/yeah.rss.xml b/pelican/tests/output/custom/feeds/yeah.rss.xml
similarity index 100%
rename from tests/output/custom/feeds/yeah.rss.xml
rename to pelican/tests/output/custom/feeds/yeah.rss.xml
diff --git a/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
similarity index 100%
rename from tests/output/custom/index.html
rename to pelican/tests/output/custom/index.html
diff --git a/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
similarity index 100%
rename from tests/output/custom/index2.html
rename to pelican/tests/output/custom/index2.html
diff --git a/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
similarity index 100%
rename from tests/output/custom/oh-yeah-fr.html
rename to pelican/tests/output/custom/oh-yeah-fr.html
diff --git a/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
similarity index 100%
rename from tests/output/custom/oh-yeah.html
rename to pelican/tests/output/custom/oh-yeah.html
diff --git a/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
similarity index 100%
rename from tests/output/custom/pages/this-is-a-test-hidden-page.html
rename to pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
diff --git a/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
similarity index 100%
rename from tests/output/custom/pages/this-is-a-test-page.html
rename to pelican/tests/output/custom/pages/this-is-a-test-page.html
diff --git a/tests/output/custom/robots.txt b/pelican/tests/output/custom/robots.txt
similarity index 100%
rename from tests/output/custom/robots.txt
rename to pelican/tests/output/custom/robots.txt
diff --git a/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
similarity index 100%
rename from tests/output/custom/second-article-fr.html
rename to pelican/tests/output/custom/second-article-fr.html
diff --git a/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
similarity index 100%
rename from tests/output/custom/second-article.html
rename to pelican/tests/output/custom/second-article.html
diff --git a/tests/output/custom/static/pictures/Fat_Cat.jpg b/pelican/tests/output/custom/static/pictures/Fat_Cat.jpg
similarity index 100%
rename from tests/output/custom/static/pictures/Fat_Cat.jpg
rename to pelican/tests/output/custom/static/pictures/Fat_Cat.jpg
diff --git a/tests/output/custom/static/pictures/Sushi.jpg b/pelican/tests/output/custom/static/pictures/Sushi.jpg
similarity index 100%
rename from tests/output/custom/static/pictures/Sushi.jpg
rename to pelican/tests/output/custom/static/pictures/Sushi.jpg
diff --git a/tests/output/custom/static/pictures/Sushi_Macro.jpg b/pelican/tests/output/custom/static/pictures/Sushi_Macro.jpg
similarity index 100%
rename from tests/output/custom/static/pictures/Sushi_Macro.jpg
rename to pelican/tests/output/custom/static/pictures/Sushi_Macro.jpg
diff --git a/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
similarity index 100%
rename from tests/output/custom/tag/bar.html
rename to pelican/tests/output/custom/tag/bar.html
diff --git a/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
similarity index 100%
rename from tests/output/custom/tag/baz.html
rename to pelican/tests/output/custom/tag/baz.html
diff --git a/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
similarity index 100%
rename from tests/output/custom/tag/foo.html
rename to pelican/tests/output/custom/tag/foo.html
diff --git a/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
similarity index 100%
rename from tests/output/custom/tag/foobar.html
rename to pelican/tests/output/custom/tag/foobar.html
diff --git a/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
similarity index 100%
rename from tests/output/custom/tag/oh.html
rename to pelican/tests/output/custom/tag/oh.html
diff --git a/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
similarity index 100%
rename from tests/output/custom/tag/yeah.html
rename to pelican/tests/output/custom/tag/yeah.html
diff --git a/tests/output/custom/tags.html b/pelican/tests/output/custom/tags.html
similarity index 100%
rename from tests/output/custom/tags.html
rename to pelican/tests/output/custom/tags.html
diff --git a/tests/output/custom/theme/css/main.css b/pelican/tests/output/custom/theme/css/main.css
similarity index 100%
rename from tests/output/custom/theme/css/main.css
rename to pelican/tests/output/custom/theme/css/main.css
diff --git a/tests/output/custom/theme/css/pygment.css b/pelican/tests/output/custom/theme/css/pygment.css
similarity index 100%
rename from tests/output/custom/theme/css/pygment.css
rename to pelican/tests/output/custom/theme/css/pygment.css
diff --git a/tests/output/custom/theme/css/reset.css b/pelican/tests/output/custom/theme/css/reset.css
similarity index 100%
rename from tests/output/custom/theme/css/reset.css
rename to pelican/tests/output/custom/theme/css/reset.css
diff --git a/tests/output/custom/theme/css/typogrify.css b/pelican/tests/output/custom/theme/css/typogrify.css
similarity index 100%
rename from tests/output/custom/theme/css/typogrify.css
rename to pelican/tests/output/custom/theme/css/typogrify.css
diff --git a/tests/output/custom/theme/css/wide.css b/pelican/tests/output/custom/theme/css/wide.css
similarity index 100%
rename from tests/output/custom/theme/css/wide.css
rename to pelican/tests/output/custom/theme/css/wide.css
diff --git a/tests/output/custom/theme/images/icons/delicious.png b/pelican/tests/output/custom/theme/images/icons/delicious.png
similarity index 100%
rename from tests/output/custom/theme/images/icons/delicious.png
rename to pelican/tests/output/custom/theme/images/icons/delicious.png
diff --git a/tests/output/custom/theme/images/icons/facebook.png b/pelican/tests/output/custom/theme/images/icons/facebook.png
similarity index 100%
rename from tests/output/custom/theme/images/icons/facebook.png
rename to pelican/tests/output/custom/theme/images/icons/facebook.png
diff --git a/tests/output/custom/theme/images/icons/gitorious.png b/pelican/tests/output/custom/theme/images/icons/gitorious.png
similarity index 100%
rename from tests/output/custom/theme/images/icons/gitorious.png
rename to pelican/tests/output/custom/theme/images/icons/gitorious.png
diff --git a/tests/output/custom/theme/images/icons/lastfm.png b/pelican/tests/output/custom/theme/images/icons/lastfm.png
similarity index 100%
rename from tests/output/custom/theme/images/icons/lastfm.png
rename to pelican/tests/output/custom/theme/images/icons/lastfm.png
diff --git a/tests/output/custom/theme/images/icons/linkedin.png b/pelican/tests/output/custom/theme/images/icons/linkedin.png
similarity index 100%
rename from tests/output/custom/theme/images/icons/linkedin.png
rename to pelican/tests/output/custom/theme/images/icons/linkedin.png
diff --git a/tests/output/custom/theme/images/icons/rss.png b/pelican/tests/output/custom/theme/images/icons/rss.png
similarity index 100%
rename from tests/output/custom/theme/images/icons/rss.png
rename to pelican/tests/output/custom/theme/images/icons/rss.png
diff --git a/tests/output/custom/theme/images/icons/twitter.png b/pelican/tests/output/custom/theme/images/icons/twitter.png
similarity index 100%
rename from tests/output/custom/theme/images/icons/twitter.png
rename to pelican/tests/output/custom/theme/images/icons/twitter.png
diff --git a/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
similarity index 100%
rename from tests/output/custom/this-is-a-super-article.html
rename to pelican/tests/output/custom/this-is-a-super-article.html
diff --git a/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
similarity index 100%
rename from tests/output/custom/unbelievable.html
rename to pelican/tests/output/custom/unbelievable.html
diff --git a/tests/support.py b/pelican/tests/support.py
similarity index 100%
rename from tests/support.py
rename to pelican/tests/support.py
diff --git a/tests/test_contents.py b/pelican/tests/test_contents.py
similarity index 100%
rename from tests/test_contents.py
rename to pelican/tests/test_contents.py
diff --git a/tests/test_generators.py b/pelican/tests/test_generators.py
similarity index 100%
rename from tests/test_generators.py
rename to pelican/tests/test_generators.py
diff --git a/tests/test_importer.py b/pelican/tests/test_importer.py
similarity index 100%
rename from tests/test_importer.py
rename to pelican/tests/test_importer.py
diff --git a/tests/test_pelican.py b/pelican/tests/test_pelican.py
similarity index 97%
rename from tests/test_pelican.py
rename to pelican/tests/test_pelican.py
index 78f083f9d..9cb6a479c 100644
--- a/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -15,7 +15,8 @@
 from pelican.settings import read_settings
 
 CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
-SAMPLES_PATH = os.path.abspath(os.sep.join((CURRENT_DIR, "..", "samples")))
+SAMPLES_PATH = os.path.abspath(os.sep.join((CURRENT_DIR, "..", "..",
+                                            "samples")))
 OUTPUT_PATH = os.path.abspath(os.sep.join((CURRENT_DIR, "output")))
 
 INPUT_PATH = os.path.join(SAMPLES_PATH, "content")
diff --git a/tests/test_readers.py b/pelican/tests/test_readers.py
similarity index 100%
rename from tests/test_readers.py
rename to pelican/tests/test_readers.py
diff --git a/tests/test_settings.py b/pelican/tests/test_settings.py
similarity index 100%
rename from tests/test_settings.py
rename to pelican/tests/test_settings.py
diff --git a/tests/test_utils.py b/pelican/tests/test_utils.py
similarity index 100%
rename from tests/test_utils.py
rename to pelican/tests/test_utils.py
diff --git a/setup.py b/setup.py
index 97c8ca646..82c2556ad 100755
--- a/setup.py
+++ b/setup.py
@@ -41,5 +41,5 @@
          'Topic :: Internet :: WWW/HTTP',
          'Topic :: Software Development :: Libraries :: Python Modules',
     ],
-    test_suite='tests',
+    test_suite='pelican.tests',
 )
diff --git a/tox.ini b/tox.ini
index a7dc9ec6d..1bfe64569 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 envlist = py26,py27
 
 [testenv]
-commands = nosetests -s tests
+commands = nosetests -s pelican
 deps =
     nose
     Jinja2