From 2fce883230853b0ed9afd548703f42b0bd30ae6a Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Sat, 14 Mar 2015 00:57:09 +0100 Subject: [PATCH] Move tests to directory outside of the main package --- src/{pretix/control => }/tests/__init__.py | 0 src/{pretix/base/tests => tests/base}/__init__.py | 0 src/{pretix/base/tests => tests/base}/test_cache.py | 0 src/{pretix/base/tests => tests/base}/test_middleware.py | 0 src/{pretix/base/tests => tests/base}/test_models.py | 0 src/{pretix/base/tests => tests/base}/test_plugins.py | 0 src/{pretix/base/tests => tests/base}/test_settings.py | 0 src/{pretix/presale/tests => tests/control}/__init__.py | 0 src/{pretix/control/tests => tests/control}/test_auth.py | 2 +- src/{pretix/control/tests => tests/control}/test_events.py | 2 +- src/{pretix/control/tests => tests/control}/test_items.py | 2 +- src/{pretix/control/tests => tests/control}/test_permissions.py | 0 src/tests/plugins/__init__.py | 0 .../tests.py => tests/plugins/test_timerestriction.py} | 0 src/tests/presale/__init__.py | 0 src/{pretix/presale/tests => tests/presale}/test_cart.py | 2 +- src/{pretix/presale/tests => tests/presale}/test_checkout.py | 1 - src/{pretix/presale/tests => tests/presale}/test_event.py | 2 +- 18 files changed, 5 insertions(+), 6 deletions(-) rename src/{pretix/control => }/tests/__init__.py (100%) rename src/{pretix/base/tests => tests/base}/__init__.py (100%) rename src/{pretix/base/tests => tests/base}/test_cache.py (100%) rename src/{pretix/base/tests => tests/base}/test_middleware.py (100%) rename src/{pretix/base/tests => tests/base}/test_models.py (100%) rename src/{pretix/base/tests => tests/base}/test_plugins.py (100%) rename src/{pretix/base/tests => tests/base}/test_settings.py (100%) rename src/{pretix/presale/tests => tests/control}/__init__.py (100%) rename src/{pretix/control/tests => tests/control}/test_auth.py (98%) rename src/{pretix/control/tests => tests/control}/test_events.py (98%) rename src/{pretix/control/tests => tests/control}/test_items.py (99%) rename src/{pretix/control/tests => tests/control}/test_permissions.py (100%) create mode 100644 src/tests/plugins/__init__.py rename src/{pretix/plugins/timerestriction/tests.py => tests/plugins/test_timerestriction.py} (100%) create mode 100644 src/tests/presale/__init__.py rename src/{pretix/presale/tests => tests/presale}/test_cart.py (99%) rename src/{pretix/presale/tests => tests/presale}/test_checkout.py (99%) rename src/{pretix/presale/tests => tests/presale}/test_event.py (99%) diff --git a/src/pretix/control/tests/__init__.py b/src/tests/__init__.py similarity index 100% rename from src/pretix/control/tests/__init__.py rename to src/tests/__init__.py diff --git a/src/pretix/base/tests/__init__.py b/src/tests/base/__init__.py similarity index 100% rename from src/pretix/base/tests/__init__.py rename to src/tests/base/__init__.py diff --git a/src/pretix/base/tests/test_cache.py b/src/tests/base/test_cache.py similarity index 100% rename from src/pretix/base/tests/test_cache.py rename to src/tests/base/test_cache.py diff --git a/src/pretix/base/tests/test_middleware.py b/src/tests/base/test_middleware.py similarity index 100% rename from src/pretix/base/tests/test_middleware.py rename to src/tests/base/test_middleware.py diff --git a/src/pretix/base/tests/test_models.py b/src/tests/base/test_models.py similarity index 100% rename from src/pretix/base/tests/test_models.py rename to src/tests/base/test_models.py diff --git a/src/pretix/base/tests/test_plugins.py b/src/tests/base/test_plugins.py similarity index 100% rename from src/pretix/base/tests/test_plugins.py rename to src/tests/base/test_plugins.py diff --git a/src/pretix/base/tests/test_settings.py b/src/tests/base/test_settings.py similarity index 100% rename from src/pretix/base/tests/test_settings.py rename to src/tests/base/test_settings.py diff --git a/src/pretix/presale/tests/__init__.py b/src/tests/control/__init__.py similarity index 100% rename from src/pretix/presale/tests/__init__.py rename to src/tests/control/__init__.py diff --git a/src/pretix/control/tests/test_auth.py b/src/tests/control/test_auth.py similarity index 98% rename from src/pretix/control/tests/test_auth.py rename to src/tests/control/test_auth.py index c6351ad886..c5237ac543 100644 --- a/src/pretix/control/tests/test_auth.py +++ b/src/tests/control/test_auth.py @@ -1,7 +1,7 @@ from django.test import TestCase, Client from pretix.base.models import User -from pretix.base.tests import BrowserTest +from tests.base import BrowserTest class LoginFormBrowserTest(BrowserTest): diff --git a/src/pretix/control/tests/test_events.py b/src/tests/control/test_events.py similarity index 98% rename from src/pretix/control/tests/test_events.py rename to src/tests/control/test_events.py index 2a3f7c4bcd..7b49f7d029 100644 --- a/src/pretix/control/tests/test_events.py +++ b/src/tests/control/test_events.py @@ -1,6 +1,6 @@ import datetime from pretix.base.models import User, Organizer, Event, OrganizerPermission, EventPermission -from pretix.base.tests import BrowserTest +from tests.base import BrowserTest class EventsTest(BrowserTest): diff --git a/src/pretix/control/tests/test_items.py b/src/tests/control/test_items.py similarity index 99% rename from src/pretix/control/tests/test_items.py rename to src/tests/control/test_items.py index 3b13e8e0b7..e62ba8cb6b 100644 --- a/src/pretix/control/tests/test_items.py +++ b/src/tests/control/test_items.py @@ -5,7 +5,7 @@ import unittest from selenium.webdriver.support.select import Select from pretix.base.models import User, Organizer, Event, OrganizerPermission, EventPermission, ItemCategory, Property, \ PropertyValue, Question, Quota, Item -from pretix.base.tests import BrowserTest +from tests.base import BrowserTest class ItemFormTest(BrowserTest): diff --git a/src/pretix/control/tests/test_permissions.py b/src/tests/control/test_permissions.py similarity index 100% rename from src/pretix/control/tests/test_permissions.py rename to src/tests/control/test_permissions.py diff --git a/src/tests/plugins/__init__.py b/src/tests/plugins/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/pretix/plugins/timerestriction/tests.py b/src/tests/plugins/test_timerestriction.py similarity index 100% rename from src/pretix/plugins/timerestriction/tests.py rename to src/tests/plugins/test_timerestriction.py diff --git a/src/tests/presale/__init__.py b/src/tests/presale/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/pretix/presale/tests/test_cart.py b/src/tests/presale/test_cart.py similarity index 99% rename from src/pretix/presale/tests/test_cart.py rename to src/tests/presale/test_cart.py index 761570e352..058d952171 100644 --- a/src/pretix/presale/tests/test_cart.py +++ b/src/tests/presale/test_cart.py @@ -7,7 +7,7 @@ from datetime import timedelta from pretix.base.models import Item, Organizer, Event, ItemCategory, Quota, Property, PropertyValue, ItemVariation, User, \ CartPosition -from pretix.base.tests import BrowserTest +from tests.base import BrowserTest class CartTestMixin: diff --git a/src/pretix/presale/tests/test_checkout.py b/src/tests/presale/test_checkout.py similarity index 99% rename from src/pretix/presale/tests/test_checkout.py rename to src/tests/presale/test_checkout.py index e9a34fb135..fbd40d9d3c 100644 --- a/src/pretix/presale/tests/test_checkout.py +++ b/src/tests/presale/test_checkout.py @@ -1,5 +1,4 @@ import datetime -import time from unittest import expectedFailure from bs4 import BeautifulSoup from django.test import TestCase diff --git a/src/pretix/presale/tests/test_event.py b/src/tests/presale/test_event.py similarity index 99% rename from src/pretix/presale/tests/test_event.py rename to src/tests/presale/test_event.py index 5f2d9a00e3..f6bc188b1d 100644 --- a/src/pretix/presale/tests/test_event.py +++ b/src/tests/presale/test_event.py @@ -1,7 +1,7 @@ import datetime from pretix.base.models import Item, Organizer, Event, ItemCategory, Quota, Property, PropertyValue, ItemVariation -from pretix.base.tests import BrowserTest +from tests.base import BrowserTest class EventMiddlewareTest(BrowserTest):