Hoist tests out of the core package

Tests are not part of the core logic of Hyde, and they should not be packaged as such.
hyde · Nov 8, 2015 · 0a9f3a7 · 0a9f3a7
1 parent b73261c
commit 0a9f3a7
Show file tree

Hide file tree

Showing 140 changed files with 18 additions and 13 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -8,5 +8,5 @@ include requirements.txt
 include dev-req.txt
 include dev-only.txt
 recursive-include hyde *.py
-recursive-include hyde/tests *.py
+recursive-include tests *.py
 recursive-include hyde/layouts *.*
diff --git a/hyde/tests/README.rst → tests/README.rst b/hyde/tests/README.rst → tests/README.rst
@@ -42,4 +42,4 @@ Run the tests
 =============
 
 ::
-    nosetests hyde/tests
+    nosetests tests
diff --git a/hyde/tests/__init__.py → tests/__init__.py b/hyde/tests/__init__.py → tests/__init__.py
diff --git a/hyde/tests/ext/__init__.py → tests/ext/__init__.py b/hyde/tests/ext/__init__.py → tests/ext/__init__.py
diff --git a/hyde/tests/ext/combine/script.1.js → tests/ext/combine/script.1.js b/hyde/tests/ext/combine/script.1.js → tests/ext/combine/script.1.js
diff --git a/hyde/tests/ext/combine/script.2.js → tests/ext/combine/script.2.js b/hyde/tests/ext/combine/script.2.js → tests/ext/combine/script.2.js
diff --git a/hyde/tests/ext/combine/script.3.js → tests/ext/combine/script.3.js b/hyde/tests/ext/combine/script.3.js → tests/ext/combine/script.3.js
diff --git a/hyde/tests/ext/images/landscape.jpg → tests/ext/images/landscape.jpg b/hyde/tests/ext/images/landscape.jpg → tests/ext/images/landscape.jpg
diff --git a/hyde/tests/ext/images/portrait.jpg → tests/ext/images/portrait.jpg b/hyde/tests/ext/images/portrait.jpg → tests/ext/images/portrait.jpg
diff --git a/hyde/tests/ext/less/expected-site.css → tests/ext/less/expected-site.css b/hyde/tests/ext/less/expected-site.css → tests/ext/less/expected-site.css
diff --git a/hyde/tests/ext/less/inc/mixin.less → tests/ext/less/inc/mixin.less b/hyde/tests/ext/less/inc/mixin.less → tests/ext/less/inc/mixin.less
diff --git a/hyde/tests/ext/less/inc/reset.css → tests/ext/less/inc/reset.css b/hyde/tests/ext/less/inc/reset.css → tests/ext/less/inc/reset.css
diff --git a/hyde/tests/ext/less/inc/vars.less → tests/ext/less/inc/vars.less b/hyde/tests/ext/less/inc/vars.less → tests/ext/less/inc/vars.less
diff --git a/hyde/tests/ext/less/site.less → tests/ext/less/site.less b/hyde/tests/ext/less/site.less → tests/ext/less/site.less
diff --git a/hyde/tests/ext/optipng/hyde-lt-b.png → tests/ext/optipng/hyde-lt-b.png b/hyde/tests/ext/optipng/hyde-lt-b.png → tests/ext/optipng/hyde-lt-b.png
diff --git a/hyde/tests/ext/requirejs/app.js → tests/ext/requirejs/app.js b/hyde/tests/ext/requirejs/app.js → tests/ext/requirejs/app.js
diff --git a/hyde/tests/ext/requirejs/lib/less.js → tests/ext/requirejs/lib/less.js b/hyde/tests/ext/requirejs/lib/less.js → tests/ext/requirejs/lib/less.js
diff --git a/hyde/tests/ext/requirejs/lib/more.js → tests/ext/requirejs/lib/more.js b/hyde/tests/ext/requirejs/lib/more.js → tests/ext/requirejs/lib/more.js
diff --git a/hyde/tests/ext/requirejs/main.js → tests/ext/requirejs/main.js b/hyde/tests/ext/requirejs/main.js → tests/ext/requirejs/main.js
diff --git a/hyde/tests/ext/requirejs/rjs.conf → tests/ext/requirejs/rjs.conf b/hyde/tests/ext/requirejs/rjs.conf → tests/ext/requirejs/rjs.conf
diff --git a/hyde/tests/ext/scss/expected-sass.css → tests/ext/scss/expected-sass.css b/hyde/tests/ext/scss/expected-sass.css → tests/ext/scss/expected-sass.css
diff --git a/hyde/tests/ext/scss/expected-site.css → tests/ext/scss/expected-site.css b/hyde/tests/ext/scss/expected-site.css → tests/ext/scss/expected-site.css
diff --git a/hyde/tests/ext/scss/inc/mixin.scss → tests/ext/scss/inc/mixin.scss b/hyde/tests/ext/scss/inc/mixin.scss → tests/ext/scss/inc/mixin.scss
diff --git a/hyde/tests/ext/scss/inc/reset.css → tests/ext/scss/inc/reset.css b/hyde/tests/ext/scss/inc/reset.css → tests/ext/scss/inc/reset.css
diff --git a/hyde/tests/ext/scss/inc/vars.scss → tests/ext/scss/inc/vars.scss b/hyde/tests/ext/scss/inc/vars.scss → tests/ext/scss/inc/vars.scss
diff --git a/hyde/tests/ext/scss/sass.scss → tests/ext/scss/sass.scss b/hyde/tests/ext/scss/sass.scss → tests/ext/scss/sass.scss
diff --git a/hyde/tests/ext/scss/site.scss → tests/ext/scss/site.scss b/hyde/tests/ext/scss/site.scss → tests/ext/scss/site.scss
diff --git a/...s/ext/stylus/expected-site-compressed.css → ...s/ext/stylus/expected-site-compressed.css b/...s/ext/stylus/expected-site-compressed.css → ...s/ext/stylus/expected-site-compressed.css
diff --git a/hyde/tests/ext/stylus/expected-site.css → tests/ext/stylus/expected-site.css b/hyde/tests/ext/stylus/expected-site.css → tests/ext/stylus/expected-site.css
diff --git a/hyde/tests/ext/stylus/inc/mixin.styl → tests/ext/stylus/inc/mixin.styl b/hyde/tests/ext/stylus/inc/mixin.styl → tests/ext/stylus/inc/mixin.styl
diff --git a/hyde/tests/ext/stylus/inc/reset.css → tests/ext/stylus/inc/reset.css b/hyde/tests/ext/stylus/inc/reset.css → tests/ext/stylus/inc/reset.css
diff --git a/hyde/tests/ext/stylus/inc/vars.styl → tests/ext/stylus/inc/vars.styl b/hyde/tests/ext/stylus/inc/vars.styl → tests/ext/stylus/inc/vars.styl
diff --git a/hyde/tests/ext/stylus/site.styl → tests/ext/stylus/site.styl b/hyde/tests/ext/stylus/site.styl → tests/ext/stylus/site.styl
diff --git a/hyde/tests/ext/test_auto_extend.py → tests/ext/test_auto_extend.py b/hyde/tests/ext/test_auto_extend.py → tests/ext/test_auto_extend.py
diff --git a/hyde/tests/ext/test_blockdown.py → tests/ext/test_blockdown.py b/hyde/tests/ext/test_blockdown.py → tests/ext/test_blockdown.py
diff --git a/hyde/tests/ext/test_combine.py → tests/ext/test_combine.py b/hyde/tests/ext/test_combine.py → tests/ext/test_combine.py
diff --git a/hyde/tests/ext/test_depends.py → tests/ext/test_depends.py b/hyde/tests/ext/test_depends.py → tests/ext/test_depends.py
diff --git a/hyde/tests/ext/test_drafts.py → tests/ext/test_drafts.py b/hyde/tests/ext/test_drafts.py → tests/ext/test_drafts.py
diff --git a/hyde/tests/ext/test_flattener.py → tests/ext/test_flattener.py b/hyde/tests/ext/test_flattener.py → tests/ext/test_flattener.py
diff --git a/hyde/tests/ext/test_grouper.py → tests/ext/test_grouper.py b/hyde/tests/ext/test_grouper.py → tests/ext/test_grouper.py
@@ -10,9 +10,10 @@
 from hyde.model import Config, Expando
 
 from fswrap import File
-from hyde.tests.util import assert_html_equals
 import yaml
 
+from ..util import assert_html_equals
+
 TEST_SITE = File(__file__).parent.parent.child_folder('_test')
 
 

diff --git a/hyde/tests/ext/test_images.py → tests/ext/test_images.py b/hyde/tests/ext/test_images.py → tests/ext/test_images.py
diff --git a/hyde/tests/ext/test_less.py → tests/ext/test_less.py b/hyde/tests/ext/test_less.py → tests/ext/test_less.py
diff --git a/hyde/tests/ext/test_markings.py → tests/ext/test_markings.py b/hyde/tests/ext/test_markings.py → tests/ext/test_markings.py
diff --git a/hyde/tests/ext/test_meta.py → tests/ext/test_meta.py b/hyde/tests/ext/test_meta.py → tests/ext/test_meta.py
diff --git a/hyde/tests/ext/test_optipng.py → tests/ext/test_optipng.py b/hyde/tests/ext/test_optipng.py → tests/ext/test_optipng.py
diff --git a/hyde/tests/ext/test_paginator.py → tests/ext/test_paginator.py b/hyde/tests/ext/test_paginator.py → tests/ext/test_paginator.py
diff --git a/hyde/tests/ext/test_requirejs.py → tests/ext/test_requirejs.py b/hyde/tests/ext/test_requirejs.py → tests/ext/test_requirejs.py
diff --git a/hyde/tests/ext/test_sass.py → tests/ext/test_sass.py b/hyde/tests/ext/test_sass.py → tests/ext/test_sass.py
@@ -6,10 +6,11 @@
 """
 from hyde.generator import Generator
 from hyde.site import Site
-from hyde.tests.util import assert_no_diff
 
 from fswrap import File, Folder
 
+from ..util import assert_no_diff
+
 SCSS_SOURCE = File(__file__).parent.child_folder('scss')
 TEST_SITE = File(__file__).parent.parent.child_folder('_test')
 

diff --git a/hyde/tests/ext/test_scss.py → tests/ext/test_scss.py b/hyde/tests/ext/test_scss.py → tests/ext/test_scss.py
@@ -6,10 +6,11 @@
 """
 from hyde.generator import Generator
 from hyde.site import Site
-from hyde.tests.util import assert_no_diff
 
 from fswrap import File, Folder
 
+from ..util import assert_no_diff
+
 SCSS_SOURCE = File(__file__).parent.child_folder('scss')
 TEST_SITE = File(__file__).parent.parent.child_folder('_test')
 

diff --git a/hyde/tests/ext/test_sorter.py → tests/ext/test_sorter.py b/hyde/tests/ext/test_sorter.py → tests/ext/test_sorter.py
diff --git a/hyde/tests/ext/test_stylus.py → tests/ext/test_stylus.py b/hyde/tests/ext/test_stylus.py → tests/ext/test_stylus.py
diff --git a/hyde/tests/ext/test_syntext.py → tests/ext/test_syntext.py b/hyde/tests/ext/test_syntext.py → tests/ext/test_syntext.py
diff --git a/hyde/tests/ext/test_tagger.py → tests/ext/test_tagger.py b/hyde/tests/ext/test_tagger.py → tests/ext/test_tagger.py
diff --git a/hyde/tests/ext/test_textlinks.py → tests/ext/test_textlinks.py b/hyde/tests/ext/test_textlinks.py → tests/ext/test_textlinks.py
diff --git a/hyde/tests/ext/test_uglify.py → tests/ext/test_uglify.py b/hyde/tests/ext/test_uglify.py → tests/ext/test_uglify.py
@@ -4,12 +4,14 @@
 `$ pip install nose`
 `$ nosetests`
 """
+
 from hyde.model import Expando
 from hyde.generator import Generator
 from hyde.site import Site
 
 from fswrap import File, Folder
-from hyde.tests.util import assert_no_diff
+
+from ..util import assert_no_diff
 
 UGLIFY_SOURCE = File(__file__).parent.child_folder('uglify')
 TEST_SITE = File(__file__).parent.parent.child_folder('_test')

diff --git a/hyde/tests/ext/test_urlcleaner.py → tests/ext/test_urlcleaner.py b/hyde/tests/ext/test_urlcleaner.py → tests/ext/test_urlcleaner.py
diff --git a/hyde/tests/ext/uglify/expected-jquery-nc.js → tests/ext/uglify/expected-jquery-nc.js b/hyde/tests/ext/uglify/expected-jquery-nc.js → tests/ext/uglify/expected-jquery-nc.js
diff --git a/hyde/tests/ext/uglify/expected-jquery.js → tests/ext/uglify/expected-jquery.js b/hyde/tests/ext/uglify/expected-jquery.js → tests/ext/uglify/expected-jquery.js
diff --git a/hyde/tests/ext/uglify/jquery.js → tests/ext/uglify/jquery.js b/hyde/tests/ext/uglify/jquery.js → tests/ext/uglify/jquery.js
diff --git a/hyde/tests/sites/test_grouper/alternate.yaml → tests/sites/test_grouper/alternate.yaml b/hyde/tests/sites/test_grouper/alternate.yaml → tests/sites/test_grouper/alternate.yaml
diff --git a/...tests/sites/test_grouper/content/404.html → tests/sites/test_grouper/content/404.html b/...tests/sites/test_grouper/content/404.html → tests/sites/test_grouper/content/404.html
diff --git a/...sts/sites/test_grouper/content/about.html → tests/sites/test_grouper/content/about.html b/...sts/sites/test_grouper/content/about.html → tests/sites/test_grouper/content/about.html
diff --git a/...test_grouper/content/apple-touch-icon.png → ...test_grouper/content/apple-touch-icon.png b/...test_grouper/content/apple-touch-icon.png → ...test_grouper/content/apple-touch-icon.png
diff --git a/...st_grouper/content/blog/installation.html → ...st_grouper/content/blog/installation.html b/...st_grouper/content/blog/installation.html → ...st_grouper/content/blog/installation.html
diff --git a/...sites/test_grouper/content/blog/meta.yaml → ...sites/test_grouper/content/blog/meta.yaml b/...sites/test_grouper/content/blog/meta.yaml → ...sites/test_grouper/content/blog/meta.yaml
diff --git a/...s/test_grouper/content/blog/overview.html → ...s/test_grouper/content/blog/overview.html b/...s/test_grouper/content/blog/overview.html → ...s/test_grouper/content/blog/overview.html
diff --git a/...es/test_grouper/content/blog/plugins.html → ...es/test_grouper/content/blog/plugins.html b/...es/test_grouper/content/blog/plugins.html → ...es/test_grouper/content/blog/plugins.html
diff --git a/...sites/test_grouper/content/blog/tags.html → ...sites/test_grouper/content/blog/tags.html b/...sites/test_grouper/content/blog/tags.html → ...sites/test_grouper/content/blog/tags.html
diff --git a/...test_grouper/content/blog/templating.html → ...test_grouper/content/blog/templating.html b/...test_grouper/content/blog/templating.html → ...test_grouper/content/blog/templating.html
diff --git a/...ites/test_grouper/content/crossdomain.xml → ...ites/test_grouper/content/crossdomain.xml b/...ites/test_grouper/content/crossdomain.xml → ...ites/test_grouper/content/crossdomain.xml
diff --git a/...ts/sites/test_grouper/content/favicon.ico → tests/sites/test_grouper/content/favicon.ico b/...ts/sites/test_grouper/content/favicon.ico → tests/sites/test_grouper/content/favicon.ico
diff --git a/...s/test_grouper/content/media/css/site.css → ...s/test_grouper/content/media/css/site.css b/...s/test_grouper/content/media/css/site.css → ...s/test_grouper/content/media/css/site.css
diff --git a/...sts/sites/test_grouper/content/robots.txt → tests/sites/test_grouper/content/robots.txt b/...sts/sites/test_grouper/content/robots.txt → tests/sites/test_grouper/content/robots.txt
diff --git a/hyde/tests/sites/test_grouper/info.yaml → tests/sites/test_grouper/info.yaml b/hyde/tests/sites/test_grouper/info.yaml → tests/sites/test_grouper/info.yaml
diff --git a/...tests/sites/test_grouper/layout/base.html → tests/sites/test_grouper/layout/base.html b/...tests/sites/test_grouper/layout/base.html → tests/sites/test_grouper/layout/base.html
diff --git a/.../sites/test_grouper/layout/blog/post.html → .../sites/test_grouper/layout/blog/post.html b/.../sites/test_grouper/layout/blog/post.html → .../sites/test_grouper/layout/blog/post.html
diff --git a/...tests/sites/test_grouper/layout/root.html → tests/sites/test_grouper/layout/root.html b/...tests/sites/test_grouper/layout/root.html → tests/sites/test_grouper/layout/root.html
diff --git a/hyde/tests/sites/test_grouper/site.yaml → tests/sites/test_grouper/site.yaml b/hyde/tests/sites/test_grouper/site.yaml → tests/sites/test_grouper/site.yaml
diff --git a/hyde/tests/sites/test_jinja/alternate.yaml → tests/sites/test_jinja/alternate.yaml b/hyde/tests/sites/test_jinja/alternate.yaml → tests/sites/test_jinja/alternate.yaml
diff --git a/hyde/tests/sites/test_jinja/content/404.html → tests/sites/test_jinja/content/404.html b/hyde/tests/sites/test_jinja/content/404.html → tests/sites/test_jinja/content/404.html
diff --git a/...tests/sites/test_jinja/content/about.html → tests/sites/test_jinja/content/about.html b/...tests/sites/test_jinja/content/about.html → tests/sites/test_jinja/content/about.html
diff --git a/...s/test_jinja/content/apple-touch-icon.png → ...s/test_jinja/content/apple-touch-icon.png b/...s/test_jinja/content/apple-touch-icon.png → ...s/test_jinja/content/apple-touch-icon.png
diff --git a/...t/blog/2010/december/merry-christmas.html → ...t/blog/2010/december/merry-christmas.html b/...t/blog/2010/december/merry-christmas.html → ...t/blog/2010/december/merry-christmas.html
diff --git a/.../sites/test_jinja/content/crossdomain.xml → .../sites/test_jinja/content/crossdomain.xml b/.../sites/test_jinja/content/crossdomain.xml → .../sites/test_jinja/content/crossdomain.xml
diff --git a/...ests/sites/test_jinja/content/favicon.ico → tests/sites/test_jinja/content/favicon.ico b/...ests/sites/test_jinja/content/favicon.ico → tests/sites/test_jinja/content/favicon.ico
diff --git a/...tes/test_jinja/content/media/css/site.css → ...tes/test_jinja/content/media/css/site.css b/...tes/test_jinja/content/media/css/site.css → ...tes/test_jinja/content/media/css/site.css
diff --git a/...tests/sites/test_jinja/content/robots.txt → tests/sites/test_jinja/content/robots.txt b/...tests/sites/test_jinja/content/robots.txt → tests/sites/test_jinja/content/robots.txt
diff --git a/hyde/tests/sites/test_jinja/info.yaml → tests/sites/test_jinja/info.yaml b/hyde/tests/sites/test_jinja/info.yaml → tests/sites/test_jinja/info.yaml
diff --git a/hyde/tests/sites/test_jinja/layout/base.html → tests/sites/test_jinja/layout/base.html b/hyde/tests/sites/test_jinja/layout/base.html → tests/sites/test_jinja/layout/base.html
diff --git a/...ts/sites/test_jinja/layout/blog/post.html → tests/sites/test_jinja/layout/blog/post.html b/...ts/sites/test_jinja/layout/blog/post.html → tests/sites/test_jinja/layout/blog/post.html
diff --git a/hyde/tests/sites/test_jinja/layout/root.html → tests/sites/test_jinja/layout/root.html b/hyde/tests/sites/test_jinja/layout/root.html → tests/sites/test_jinja/layout/root.html
diff --git a/hyde/tests/sites/test_jinja/site.yaml → tests/sites/test_jinja/site.yaml b/hyde/tests/sites/test_jinja/site.yaml → tests/sites/test_jinja/site.yaml
diff --git a/...st_paginator/content/blog/angry-post.html → ...st_paginator/content/blog/angry-post.html b/...st_paginator/content/blog/angry-post.html → ...st_paginator/content/blog/angry-post.html
diff --git a/...inator/content/blog/another-sad-post.html → ...inator/content/blog/another-sad-post.html b/...inator/content/blog/another-sad-post.html → ...inator/content/blog/another-sad-post.html
diff --git a/...st_paginator/content/blog/happy-post.html → ...st_paginator/content/blog/happy-post.html b/...st_paginator/content/blog/happy-post.html → ...st_paginator/content/blog/happy-post.html
diff --git a/...test_paginator/content/blog/sad-post.html → ...test_paginator/content/blog/sad-post.html b/...test_paginator/content/blog/sad-post.html → ...test_paginator/content/blog/sad-post.html
diff --git a/...paginator/content/custom_file_pattern.txt → ...paginator/content/custom_file_pattern.txt b/...paginator/content/custom_file_pattern.txt → ...paginator/content/custom_file_pattern.txt
diff --git a/...ts/sites/test_paginator/content/empty.txt → tests/sites/test_paginator/content/empty.txt b/...ts/sites/test_paginator/content/empty.txt → tests/sites/test_paginator/content/empty.txt
diff --git a/...s/test_paginator/content/pages_of_one.txt → ...s/test_paginator/content/pages_of_one.txt b/...s/test_paginator/content/pages_of_one.txt → ...s/test_paginator/content/pages_of_one.txt
diff --git a/...s/test_paginator/content/pages_of_ten.txt → ...s/test_paginator/content/pages_of_ten.txt b/...s/test_paginator/content/pages_of_ten.txt → ...s/test_paginator/content/pages_of_ten.txt
diff --git a/...tests/sites/test_paginator/layout/root.j2 → tests/sites/test_paginator/layout/root.j2 b/...tests/sites/test_paginator/layout/root.j2 → tests/sites/test_paginator/layout/root.j2
diff --git a/hyde/tests/sites/test_paginator/site.yaml → tests/sites/test_paginator/site.yaml b/hyde/tests/sites/test_paginator/site.yaml → tests/sites/test_paginator/site.yaml
diff --git a/.../tests/sites/test_sorter/content/404.html → tests/sites/test_sorter/content/404.html b/.../tests/sites/test_sorter/content/404.html → tests/sites/test_sorter/content/404.html
diff --git a/...ests/sites/test_sorter/content/about.html → tests/sites/test_sorter/content/about.html b/...ests/sites/test_sorter/content/about.html → tests/sites/test_sorter/content/about.html
diff --git a/.../test_sorter/content/apple-touch-icon.png → .../test_sorter/content/apple-touch-icon.png b/.../test_sorter/content/apple-touch-icon.png → .../test_sorter/content/apple-touch-icon.png
diff --git a/...t/blog/2010/december/merry-christmas.html → ...t/blog/2010/december/merry-christmas.html b/...t/blog/2010/december/merry-christmas.html → ...t/blog/2010/december/merry-christmas.html
diff --git a/.../test_sorter/content/blog/angry-post.html → .../test_sorter/content/blog/angry-post.html b/.../test_sorter/content/blog/angry-post.html → .../test_sorter/content/blog/angry-post.html
diff --git a/...sorter/content/blog/another-sad-post.html → ...sorter/content/blog/another-sad-post.html b/...sorter/content/blog/another-sad-post.html → ...sorter/content/blog/another-sad-post.html
diff --git a/.../test_sorter/content/blog/happy-post.html → .../test_sorter/content/blog/happy-post.html b/.../test_sorter/content/blog/happy-post.html → .../test_sorter/content/blog/happy-post.html
diff --git a/...es/test_sorter/content/blog/sad-post.html → ...es/test_sorter/content/blog/sad-post.html b/...es/test_sorter/content/blog/sad-post.html → ...es/test_sorter/content/blog/sad-post.html
diff --git a/...sites/test_sorter/content/crossdomain.xml → ...sites/test_sorter/content/crossdomain.xml b/...sites/test_sorter/content/crossdomain.xml → ...sites/test_sorter/content/crossdomain.xml
diff --git a/...sts/sites/test_sorter/content/favicon.ico → tests/sites/test_sorter/content/favicon.ico b/...sts/sites/test_sorter/content/favicon.ico → tests/sites/test_sorter/content/favicon.ico
diff --git a/...es/test_sorter/content/media/css/site.css → ...es/test_sorter/content/media/css/site.css b/...es/test_sorter/content/media/css/site.css → ...es/test_sorter/content/media/css/site.css
diff --git a/...ests/sites/test_sorter/content/robots.txt → tests/sites/test_sorter/content/robots.txt b/...ests/sites/test_sorter/content/robots.txt → tests/sites/test_sorter/content/robots.txt
diff --git a/hyde/tests/sites/test_sorter/layout/root.j2 → tests/sites/test_sorter/layout/root.j2 b/hyde/tests/sites/test_sorter/layout/root.j2 → tests/sites/test_sorter/layout/root.j2
diff --git a/.../sites/test_sorter/layout/tagged_posts.j2 → .../sites/test_sorter/layout/tagged_posts.j2 b/.../sites/test_sorter/layout/tagged_posts.j2 → .../sites/test_sorter/layout/tagged_posts.j2
diff --git a/hyde/tests/sites/test_sorter/site.yaml → tests/sites/test_sorter/site.yaml b/hyde/tests/sites/test_sorter/site.yaml → tests/sites/test_sorter/site.yaml
diff --git a/.../test_tagger/content/blog/angry-post.html → .../test_tagger/content/blog/angry-post.html b/.../test_tagger/content/blog/angry-post.html → .../test_tagger/content/blog/angry-post.html
diff --git a/...tagger/content/blog/another-sad-post.html → ...tagger/content/blog/another-sad-post.html b/...tagger/content/blog/another-sad-post.html → ...tagger/content/blog/another-sad-post.html
diff --git a/.../test_tagger/content/blog/happy-post.html → .../test_tagger/content/blog/happy-post.html b/.../test_tagger/content/blog/happy-post.html → .../test_tagger/content/blog/happy-post.html
diff --git a/...es/test_tagger/content/blog/sad-post.html → ...es/test_tagger/content/blog/sad-post.html b/...es/test_tagger/content/blog/sad-post.html → ...es/test_tagger/content/blog/sad-post.html
diff --git a/hyde/tests/sites/test_tagger/layout/root.j2 → tests/sites/test_tagger/layout/root.j2 b/hyde/tests/sites/test_tagger/layout/root.j2 → tests/sites/test_tagger/layout/root.j2
diff --git a/.../sites/test_tagger/layout/tagged_posts.j2 → .../sites/test_tagger/layout/tagged_posts.j2 b/.../sites/test_tagger/layout/tagged_posts.j2 → .../sites/test_tagger/layout/tagged_posts.j2
diff --git a/hyde/tests/sites/test_tagger/site.yaml → tests/sites/test_tagger/site.yaml b/hyde/tests/sites/test_tagger/site.yaml → tests/sites/test_tagger/site.yaml
diff --git a/hyde/tests/ssp/ext/__init__.py → tests/ssp/ext/__init__.py b/hyde/tests/ssp/ext/__init__.py → tests/ssp/ext/__init__.py
diff --git a/hyde/tests/ssp/ext/banner.py → tests/ssp/ext/banner.py b/hyde/tests/ssp/ext/banner.py → tests/ssp/ext/banner.py
diff --git a/hyde/tests/ssp/site.yaml → tests/ssp/site.yaml b/hyde/tests/ssp/site.yaml → tests/ssp/site.yaml
diff --git a/hyde/tests/templates/jinja2/helpers.html → tests/templates/jinja2/helpers.html b/hyde/tests/templates/jinja2/helpers.html → tests/templates/jinja2/helpers.html
diff --git a/hyde/tests/templates/jinja2/index.html → tests/templates/jinja2/index.html b/hyde/tests/templates/jinja2/index.html → tests/templates/jinja2/index.html
diff --git a/...ests/templates/jinja2/index_expected.html → tests/templates/jinja2/index_expected.html b/...ests/templates/jinja2/index_expected.html → tests/templates/jinja2/index_expected.html
diff --git a/hyde/tests/templates/jinja2/layout.html → tests/templates/jinja2/layout.html b/hyde/tests/templates/jinja2/layout.html → tests/templates/jinja2/layout.html
diff --git a/hyde/tests/test_generate.py → tests/test_generate.py b/hyde/tests/test_generate.py → tests/test_generate.py
diff --git a/hyde/tests/test_initialize.py → tests/test_initialize.py b/hyde/tests/test_initialize.py → tests/test_initialize.py
diff --git a/hyde/tests/test_jinja2template.py → tests/test_jinja2template.py b/hyde/tests/test_jinja2template.py → tests/test_jinja2template.py
diff --git a/hyde/tests/test_layout.py → tests/test_layout.py b/hyde/tests/test_layout.py → tests/test_layout.py
diff --git a/hyde/tests/test_model.py → tests/test_model.py b/hyde/tests/test_model.py → tests/test_model.py
diff --git a/hyde/tests/test_plugin.py → tests/test_plugin.py b/hyde/tests/test_plugin.py → tests/test_plugin.py
@@ -68,7 +68,7 @@ def teardown_class(cls):
 
     def setUp(self):
         self.site = Site(TEST_SITE)
-        self.site.config.plugins = ['hyde.tests.test_plugin.PluginLoaderStub']
+        self.site.config.plugins = ['tests.test_plugin.PluginLoaderStub']
 
     def test_can_load_plugin_modules(self):
         assert not len(self.site.plugins)
@@ -354,8 +354,8 @@ def test_generator_template_begin_binary_resource_called_4_sngl_res(self):
 
     def test_plugin_chaining(self):
         self.site.config.plugins = [
-            'hyde.tests.test_plugin.ConstantReturnPlugin',
-            'hyde.tests.test_plugin.NoReturnPlugin'
+            'tests.test_plugin.ConstantReturnPlugin',
+            'tests.test_plugin.NoReturnPlugin'
         ]
         path = self.site.content.source_folder.child('about.html')
         gen = Generator(self.site)
@@ -372,8 +372,8 @@ def empty_return(self, resource, text=''):
             with patch.object(NoReturnPlugin, 'begin_text_resource',
                               new=Mock(wraps=empty_return)) as mock2:
                 self.site.config.plugins = [
-                    'hyde.tests.test_plugin.ConstantReturnPlugin',
-                    'hyde.tests.test_plugin.NoReturnPlugin'
+                    'tests.test_plugin.ConstantReturnPlugin',
+                    'tests.test_plugin.NoReturnPlugin'
                 ]
                 self.site.config.constantreturn = Expando(
                     dict(include_file_pattern="*.css"))
@@ -400,8 +400,8 @@ def empty_return(*args, **kwargs):
             with patch.object(NoReturnPlugin, 'begin_text_resource',
                               new=Mock(wraps=empty_return)) as mock2:
                 self.site.config.plugins = [
-                    'hyde.tests.test_plugin.ConstantReturnPlugin',
-                    'hyde.tests.test_plugin.NoReturnPlugin'
+                    'tests.test_plugin.ConstantReturnPlugin',
+                    'tests.test_plugin.NoReturnPlugin'
                 ]
                 self.site.config.constantreturn = Expando(
                     dict(include_paths="media"))

diff --git a/hyde/tests/test_simple_copy.py → tests/test_simple_copy.py b/hyde/tests/test_simple_copy.py → tests/test_simple_copy.py
diff --git a/hyde/tests/test_site.py → tests/test_site.py b/hyde/tests/test_site.py → tests/test_site.py
diff --git a/hyde/tests/util.py → tests/util.py b/hyde/tests/util.py → tests/util.py