Moving testsuite directory to root folder

diff --git a/Makefile b/Makefile
index 8adbf042fb46fcde16d555a67c4b02188b156c74..79db0f5717f1fd63120fb694771ee1da5fe36b8d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 test:
-       py.test jinja2
+       py.test --doctest-modules testsuite jinja2
 
 develop:
        pip install --editable .

diff --git a/jinja2/testsuite/conftest.py b/jinja2/testsuite/conftest.py
deleted file mode 100644 (file)
index f8154ea..0000000
--- a/jinja2/testsuite/conftest.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-    jinja2.testsuite.conftest
-    ~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    Configuration for the tests
-
-    :copyright: (c) 2010 by the Jinja Team.
-    :license: BSD, see LICENSE for more details.
-"""
-from fixtures import *

diff --git a/pytest.ini b/pytest.ini
deleted file mode 100644 (file)
index df3eb51..0000000
--- a/pytest.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[pytest]
-addopts = --doctest-modules

diff --git a/run-tests.py b/run-tests.py
deleted file mode 100644 (file)
index f8d5024..0000000
--- a/run-tests.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-import sys, os
-sys.path.insert(0, os.path.abspath(os.path.dirname(__file__)))
-from jinja2.testsuite import main
-main()

diff --git a/jinja2/testsuite/fixtures.py b/testsuite/conftest.py
similarity index 95%
rename from jinja2/testsuite/fixtures.py
rename to testsuite/conftest.py
index 2e024f64e138c27d4722259bc55d503bd1a3e0bc..b5582323d7ee4654aae3263edd8704bb923f72b9 100644 (file)
--- a/jinja2/testsuite/fixtures.py
+++ b/testsuite/conftest.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 """
-    jinja2.testsuite.fixtures
+    jinja2.testsuite.conftest
     ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    Contains fixtures used by tests.
+    Configuration and Fixtures for the tests
 
     :copyright: (c) 2010 by the Jinja Team.
     :license: BSD, see LICENSE for more details.

diff --git a/jinja2/testsuite/res/__init__.py b/testsuite/res/__init__.py
similarity index 100%
rename from jinja2/testsuite/res/__init__.py
rename to testsuite/res/__init__.py

diff --git a/jinja2/testsuite/res/templates/broken.html b/testsuite/res/templates/broken.html
similarity index 100%
rename from jinja2/testsuite/res/templates/broken.html
rename to testsuite/res/templates/broken.html

diff --git a/jinja2/testsuite/res/templates/foo/test.html b/testsuite/res/templates/foo/test.html
similarity index 100%
rename from jinja2/testsuite/res/templates/foo/test.html
rename to testsuite/res/templates/foo/test.html

diff --git a/jinja2/testsuite/res/templates/syntaxerror.html b/testsuite/res/templates/syntaxerror.html
similarity index 100%
rename from jinja2/testsuite/res/templates/syntaxerror.html
rename to testsuite/res/templates/syntaxerror.html

diff --git a/jinja2/testsuite/res/templates/test.html b/testsuite/res/templates/test.html
similarity index 100%
rename from jinja2/testsuite/res/templates/test.html
rename to testsuite/res/templates/test.html

diff --git a/jinja2/testsuite/test_api.py b/testsuite/test_api.py
similarity index 100%
rename from jinja2/testsuite/test_api.py
rename to testsuite/test_api.py

diff --git a/jinja2/testsuite/test_bytecode_cache.py b/testsuite/test_bytecode_cache.py
similarity index 100%
rename from jinja2/testsuite/test_bytecode_cache.py
rename to testsuite/test_bytecode_cache.py

diff --git a/jinja2/testsuite/test_core_tags.py b/testsuite/test_core_tags.py
similarity index 100%
rename from jinja2/testsuite/test_core_tags.py
rename to testsuite/test_core_tags.py

diff --git a/jinja2/testsuite/test_debug.py b/testsuite/test_debug.py
similarity index 100%
rename from jinja2/testsuite/test_debug.py
rename to testsuite/test_debug.py

diff --git a/jinja2/testsuite/test_ext.py b/testsuite/test_ext.py
similarity index 100%
rename from jinja2/testsuite/test_ext.py
rename to testsuite/test_ext.py

diff --git a/jinja2/testsuite/test_filters.py b/testsuite/test_filters.py
similarity index 100%
rename from jinja2/testsuite/test_filters.py
rename to testsuite/test_filters.py

diff --git a/jinja2/testsuite/test_imports.py b/testsuite/test_imports.py
similarity index 100%
rename from jinja2/testsuite/test_imports.py
rename to testsuite/test_imports.py

diff --git a/jinja2/testsuite/test_inheritance.py b/testsuite/test_inheritance.py
similarity index 100%
rename from jinja2/testsuite/test_inheritance.py
rename to testsuite/test_inheritance.py

diff --git a/jinja2/testsuite/test_lexnparse.py b/testsuite/test_lexnparse.py
similarity index 100%
rename from jinja2/testsuite/test_lexnparse.py
rename to testsuite/test_lexnparse.py

diff --git a/jinja2/testsuite/test_loader.py b/testsuite/test_loader.py
similarity index 100%
rename from jinja2/testsuite/test_loader.py
rename to testsuite/test_loader.py

diff --git a/jinja2/testsuite/test_regression.py b/testsuite/test_regression.py
similarity index 100%
rename from jinja2/testsuite/test_regression.py
rename to testsuite/test_regression.py

diff --git a/jinja2/testsuite/test_security.py b/testsuite/test_security.py
similarity index 100%
rename from jinja2/testsuite/test_security.py
rename to testsuite/test_security.py

diff --git a/jinja2/testsuite/test_tests.py b/testsuite/test_tests.py
similarity index 100%
rename from jinja2/testsuite/test_tests.py
rename to testsuite/test_tests.py

diff --git a/jinja2/testsuite/test_utils.py b/testsuite/test_utils.py
similarity index 100%
rename from jinja2/testsuite/test_utils.py
rename to testsuite/test_utils.py

diff --git a/tox.ini b/tox.ini
index e02581d1cbac0a65bd6463c2a6ebb55217e84781..ff5125bb74deed4688375368b6fb11820721e210 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -2,4 +2,4 @@
 envlist = py26, py27, pypy, py33, py34
 
 [testenv]
-commands = py.test jinja2
+commands = py.test --doctest-modules testsuite jinja2