diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2014-04-21 18:06:19 +0200 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2014-04-21 18:06:19 +0200 |
| commit | c54e7ec9ca1417bee0409489ed12f3e0f942a784 (patch) | |
| tree | fd56246707b3ad23b251828cf5272385e87bf1b5 | |
| parent | 405b13fe83e3d8c9079545429d40c434eb496893 (diff) | |
| parent | 251e833c75b761c673d69e5f2a8e0cbd07586009 (diff) | |
Merge pull request #2592 from prestontimmons/remove-test-runner-cases
Removed old test runner test cases.
| -rwxr-xr-x | tests/runtests.py | 1 | ||||
| -rw-r--r-- | tests/test_runner/valid_app/__init__.py | 3 | ||||
| -rw-r--r-- | tests/test_runner/valid_app/models/__init__.py | 0 | ||||
| -rw-r--r-- | tests/test_runner/valid_app/tests/__init__.py | 0 | ||||
| -rw-r--r-- | tests/test_runner_invalid_app/__init__.py | 4 | ||||
| -rw-r--r-- | tests/test_runner_invalid_app/models/__init__.py | 0 | ||||
| -rw-r--r-- | tests/test_runner_invalid_app/tests/__init__.py | 4 |
7 files changed, 0 insertions, 12 deletions
diff --git a/tests/runtests.py b/tests/runtests.py index e852346fc1..787b83e7a5 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -34,7 +34,6 @@ SUBDIRS_TO_SKIP = [ 'test_discovery_sample', 'test_discovery_sample2', 'test_runner_deprecation_app', - 'test_runner_invalid_app', ] ALWAYS_INSTALLED_APPS = [ diff --git a/tests/test_runner/valid_app/__init__.py b/tests/test_runner/valid_app/__init__.py deleted file mode 100644 index 8d60a80c53..0000000000 --- a/tests/test_runner/valid_app/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# Example of app layout to verify that the fix for #12658 doesn't break test -# discovery when both `models` and `tests` are packages. -# `test_runner` tests perform test discovery on this app. diff --git a/tests/test_runner/valid_app/models/__init__.py b/tests/test_runner/valid_app/models/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/test_runner/valid_app/models/__init__.py +++ /dev/null diff --git a/tests/test_runner/valid_app/tests/__init__.py b/tests/test_runner/valid_app/tests/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/test_runner/valid_app/tests/__init__.py +++ /dev/null diff --git a/tests/test_runner_invalid_app/__init__.py b/tests/test_runner_invalid_app/__init__.py deleted file mode 100644 index 45efd37d3e..0000000000 --- a/tests/test_runner_invalid_app/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -# Example of app layout that causes issue #12658: -# * Both `models` and `tests` are packages. -# * The tests raise a ImportError exception. -# `test_runner` tests performs test discovery on this app. diff --git a/tests/test_runner_invalid_app/models/__init__.py b/tests/test_runner_invalid_app/models/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/test_runner_invalid_app/models/__init__.py +++ /dev/null diff --git a/tests/test_runner_invalid_app/tests/__init__.py b/tests/test_runner_invalid_app/tests/__init__.py deleted file mode 100644 index b4ed71824b..0000000000 --- a/tests/test_runner_invalid_app/tests/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -# Tests that raise ImportError should not fail silently. -# This is a support fixture for one test case in test_runner - -raise ImportError |