Reverting "Always activate testing in every test module ever."

Revert "Always activate testing in every test module ever."

This reverts commit 0536306048daa0970d2e43411ba2a9bf073e570e.

diff --git a/mediagoblin/tests/test_api.py b/mediagoblin/tests/test_api.py
index 00cdb137ad5908c04af5e9a9adb444253ade696a..89cf1026ff400424911bf1f88079c6eb1509ab67 100644 (file)
--- a/mediagoblin/tests/test_api.py
+++ b/mediagoblin/tests/test_api.py
@@ -26,9 +26,6 @@ from mediagoblin.tests.tools import fixture_add_user
 from .resources import GOOD_JPG, GOOD_PNG, EVIL_FILE, EVIL_JPG, EVIL_PNG, \
     BIG_BLUE
 
-from mediagoblin.tools.testing import _activate_testing
-_activate_testing()
-
 
 _log = logging.getLogger(__name__)
 

diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py
index 281536778a20790218902becafe84115258a130a..755727f9d35305687a11d0c33511f20bfc93a25e 100644 (file)
--- a/mediagoblin/tests/test_auth.py
+++ b/mediagoblin/tests/test_auth.py
@@ -24,10 +24,6 @@ from mediagoblin.tests.tools import fixture_add_user
 from mediagoblin.tools import template, mail
 
 
-from mediagoblin.tools.testing import _activate_testing
-_activate_testing()
-
-
 ########################
 # Test bcrypt auth funcs
 ########################

diff --git a/mediagoblin/tests/test_celery_setup.py b/mediagoblin/tests/test_celery_setup.py
index 431d69c5e1923e44d9afc9df9e16fbbbedd0c179..5530c6f223ec924c968cc90fb6c30451877f96e4 100644 (file)
--- a/mediagoblin/tests/test_celery_setup.py
+++ b/mediagoblin/tests/test_celery_setup.py
@@ -20,11 +20,6 @@ from mediagoblin.init import celery as celery_setup
 from mediagoblin.init.config import read_mediagoblin_config
 
 
-from mediagoblin.tools.testing import _activate_testing
-_activate_testing()
-
-
-
 TEST_CELERY_CONF_NOSPECIALDB = pkg_resources.resource_filename(
     'mediagoblin.tests', 'fake_celery_conf.ini')
 

diff --git a/mediagoblin/tests/test_collections.py b/mediagoblin/tests/test_collections.py
index 42f0cc4c9b1012279c124b2103758479159cdcd9..87782f307ca84038425eecc2921c24b3ce1ef919 100644 (file)
--- a/mediagoblin/tests/test_collections.py
+++ b/mediagoblin/tests/test_collections.py
@@ -17,9 +17,6 @@
 from mediagoblin.tests.tools import fixture_add_collection, fixture_add_user
 from mediagoblin.db.models import Collection, User
 
-from mediagoblin.tools.testing import _activate_testing
-_activate_testing()
-
 
 def test_user_deletes_collection(test_app):
     # Setup db.

diff --git a/mediagoblin/tests/test_config.py b/mediagoblin/tests/test_config.py
index e84481f09cd26d1de7c83d04b2850d756762c574..b13adae6147cbbcce2fcdb05fbd5637b005633ca 100644 (file)
--- a/mediagoblin/tests/test_config.py
+++ b/mediagoblin/tests/test_config.py
@@ -17,9 +17,6 @@
 import pkg_resources
 
 from mediagoblin.init import config
-from mediagoblin.tools.testing import _activate_testing
-
-_activate_testing()
 
 
 CARROT_CONF_GOOD = pkg_resources.resource_filename(

diff --git a/mediagoblin/tests/test_csrf_middleware.py b/mediagoblin/tests/test_csrf_middleware.py
index f63c75c4c3a1280b0d3968ae216c926f1a674ff7..a272caf69997d2d21035328d6dd23419488b3429 100644 (file)
--- a/mediagoblin/tests/test_csrf_middleware.py
+++ b/mediagoblin/tests/test_csrf_middleware.py
@@ -15,9 +15,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from mediagoblin import mg_globals
-from mediagoblin.tools.testing import _activate_testing
-
-_activate_testing()
 
 
 def test_csrf_cookie_set(test_app):

diff --git a/mediagoblin/tests/test_edit.py b/mediagoblin/tests/test_edit.py
index 06cf3db0f473c323cec4cd8c0128c35b8d722d19..cda2607ff90294b0fb5c4e84f0b413b5963f297f 100644 (file)
--- a/mediagoblin/tests/test_edit.py
+++ b/mediagoblin/tests/test_edit.py
@@ -21,9 +21,6 @@ from mediagoblin.db.models import User
 from mediagoblin.tests.tools import fixture_add_user
 from mediagoblin.tools import template
 from mediagoblin.auth.lib import bcrypt_check_password
-from mediagoblin.tools.testing import _activate_testing
-
-_activate_testing()
 
 class TestUserEdit(object):
     def setup(self):

diff --git a/mediagoblin/tests/test_exif.py b/mediagoblin/tests/test_exif.py
index 4d8eae497db6efd1906e2b3f6ecf35c5ce952c5e..824de3c2586dd459bebf969416b4c823f9280a25 100644 (file)
--- a/mediagoblin/tests/test_exif.py
+++ b/mediagoblin/tests/test_exif.py
@@ -23,9 +23,6 @@ except ImportError:
 from mediagoblin.tools.exif import exif_fix_image_orientation, \
     extract_exif, clean_exif, get_gps_data, get_useful
 from .resources import GOOD_JPG, EMPTY_JPG, BAD_JPG, GPS_JPG
-from mediagoblin.tools.testing import _activate_testing
-
-_activate_testing()
 
 
 def assert_in(a, b):

diff --git a/mediagoblin/tests/test_globals.py b/mediagoblin/tests/test_globals.py
index dafd71db408a56ee5f083e74c3c252ae1b667098..fe3088f86e0889854b9d79fb5376e3659ee9f12e 100644 (file)
--- a/mediagoblin/tests/test_globals.py
+++ b/mediagoblin/tests/test_globals.py
@@ -17,9 +17,6 @@
 import pytest
 
 from mediagoblin import mg_globals
-from mediagoblin.tools.testing import _activate_testing
-
-_activate_testing()
 
 
 class TestGlobals(object):

diff --git a/mediagoblin/tests/test_http_callback.py b/mediagoblin/tests/test_http_callback.py
index 43b21140b534c2c0e39d6379b37f36c03d600830..a0511af770ac977f5e88874378fcfd8679b42e06 100644 (file)
--- a/mediagoblin/tests/test_http_callback.py
+++ b/mediagoblin/tests/test_http_callback.py
@@ -24,9 +24,6 @@ from mediagoblin.tools import processing
 from mediagoblin.tests.tools import fixture_add_user
 from mediagoblin.tests.test_submission import GOOD_PNG
 from mediagoblin.tests import test_oauth as oauth
-from mediagoblin.tools.testing import _activate_testing
-
-_activate_testing()
 
 
 class TestHTTPCallback(object):

diff --git a/mediagoblin/tests/test_messages.py b/mediagoblin/tests/test_messages.py
index e07d88d40045597ae121d639772d001569f38b23..22f9e8008b2b3c3fb191b787d1586565404bf3a5 100644 (file)
--- a/mediagoblin/tests/test_messages.py
+++ b/mediagoblin/tests/test_messages.py
@@ -16,9 +16,6 @@
 
 from mediagoblin import messages
 from mediagoblin.tools import template
-from mediagoblin.tools.testing import _activate_testing
-
-_activate_testing()
 
 
 def test_messages(test_app):

diff --git a/mediagoblin/tests/test_misc.py b/mediagoblin/tests/test_misc.py
index a16ab61d53839b47ed81358ebe950df3b85e764e..755d863fbf1a14f3601c11f8f3852a8de87cd215 100644 (file)
--- a/mediagoblin/tests/test_misc.py
+++ b/mediagoblin/tests/test_misc.py
@@ -17,9 +17,6 @@
 from mediagoblin.db.base import Session
 from mediagoblin.db.models import User, MediaEntry, MediaComment
 from mediagoblin.tests.tools import fixture_add_user, fixture_media_entry
-from mediagoblin.tools.testing import _activate_testing
-
-_activate_testing()
 
 
 def test_404_for_non_existent(test_app):

diff --git a/mediagoblin/tests/test_modelmethods.py b/mediagoblin/tests/test_modelmethods.py
index 970587e2d8503590f4acaa03630098fd4d1387bc..427aa47cfeb785487b8d62ede2287d35018517fc 100644 (file)
--- a/mediagoblin/tests/test_modelmethods.py
+++ b/mediagoblin/tests/test_modelmethods.py
@@ -17,16 +17,12 @@
 # Maybe not every model needs a test, but some models have special
 # methods, and so it makes sense to test them here.
 
-import mock
-
 from mediagoblin.db.base import Session
 from mediagoblin.db.models import MediaEntry
 
 from mediagoblin.tests.tools import fixture_add_user
-from mediagoblin.tools.testing import _activate_testing
-
-_activate_testing()
 
+import mock
 
 
 class FakeUUID(object):

diff --git a/mediagoblin/tests/test_oauth.py b/mediagoblin/tests/test_oauth.py
index 2e73c9a5cc8d3c326b0f8afa06389ceef72827f8..ea3bd798d265d0990140e1b5d5edfe6ec8ecaf0e 100644 (file)
--- a/mediagoblin/tests/test_oauth.py
+++ b/mediagoblin/tests/test_oauth.py
@@ -23,9 +23,6 @@ from urlparse import parse_qs, urlparse
 from mediagoblin import mg_globals
 from mediagoblin.tools import template, pluginapi
 from mediagoblin.tests.tools import fixture_add_user
-from mediagoblin.tools.testing import _activate_testing
-
-_activate_testing()
 
 
 _log = logging.getLogger(__name__)

diff --git a/mediagoblin/tests/test_pdf.py b/mediagoblin/tests/test_pdf.py
index e86409fe76749f343d8abc4d5ed7801bcc9bb15b..b4d1940a1a0931c9d97ad26d52980d3cc0ef7fc5 100644 (file)
--- a/mediagoblin/tests/test_pdf.py
+++ b/mediagoblin/tests/test_pdf.py
@@ -22,9 +22,6 @@ import pytest
 from mediagoblin.media_types.pdf.processing import (
     pdf_info, check_prerequisites, create_pdf_thumb)
 from .resources import GOOD_PDF as GOOD
-from mediagoblin.tools.testing import _activate_testing
-
-_activate_testing()
 
 
 @pytest.mark.skipif("not check_prerequisites()")

diff --git a/mediagoblin/tests/test_piwigo.py b/mediagoblin/tests/test_piwigo.py
index 4d0ea8852799578a972eab22198225c3c474e8bd..18f95057eba9fc71cc864aa8c48db1e3c13fc498 100644 (file)
--- a/mediagoblin/tests/test_piwigo.py
+++ b/mediagoblin/tests/test_piwigo.py
@@ -16,9 +16,6 @@
 
 import pytest
 from .tools import fixture_add_user
-from mediagoblin.tools.testing import _activate_testing
-
-_activate_testing()
 
 
 XML_PREFIX = "<?xml version='1.0' encoding='utf-8'?>\n"

diff --git a/mediagoblin/tests/test_pluginapi.py b/mediagoblin/tests/test_pluginapi.py
index c4e6d6e808bf921807a313a061bd958cfdc3309b..73ad235ec5bff65d09d4ab9be1dfda32b4bfd2a2 100644 (file)
--- a/mediagoblin/tests/test_pluginapi.py
+++ b/mediagoblin/tests/test_pluginapi.py
@@ -26,9 +26,6 @@ from mediagoblin.init.plugins import setup_plugins
 from mediagoblin.init.config import read_mediagoblin_config
 from mediagoblin.tools import pluginapi
 from mediagoblin.tests.tools import get_app
-from mediagoblin.tools.testing import _activate_testing
-
-_activate_testing()
 
 
 def with_cleanup(*modules_to_delete):

diff --git a/mediagoblin/tests/test_processing.py b/mediagoblin/tests/test_processing.py
index 493aa77be0e91d822ec9c8b0ecedaccffb2b9925..591add96924ae75c99def8f61bf0d3cf047fafc5 100644 (file)
--- a/mediagoblin/tests/test_processing.py
+++ b/mediagoblin/tests/test_processing.py
@@ -1,10 +1,6 @@
 #!/usr/bin/env python
 
 from mediagoblin import processing
-from mediagoblin.tools.testing import _activate_testing
-
-_activate_testing()
-
 
 class TestProcessing(object):
     def run_fill(self, input, format, output=None):

diff --git a/mediagoblin/tests/test_session.py b/mediagoblin/tests/test_session.py
index b8ea4150da6b7163866a7f01d325c637d50315a9..78d790eb16dd17b99e93fda109c9e65db7f8c6b2 100644 (file)
--- a/mediagoblin/tests/test_session.py
+++ b/mediagoblin/tests/test_session.py
@@ -15,10 +15,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from mediagoblin.tools import session
-from mediagoblin.tools.testing import _activate_testing
-
-_activate_testing()
-
 
 def test_session():
     sess = session.Session()

diff --git a/mediagoblin/tests/test_sql_migrations.py b/mediagoblin/tests/test_sql_migrations.py
index ff3d384f8cdd138865a9b984b019f1ff0583f6b0..2fc4c0436c1c5db60f2b5674b126d2214d89aaea 100644 (file)
--- a/mediagoblin/tests/test_sql_migrations.py
+++ b/mediagoblin/tests/test_sql_migrations.py
@@ -28,9 +28,6 @@ from migrate import changeset
 from mediagoblin.db.base import GMGTableBase
 from mediagoblin.db.migration_tools import MigrationManager, RegisterMigration
 from mediagoblin.tools.common import CollectingPrinter
-from mediagoblin.tools.testing import _activate_testing
-
-_activate_testing()
 
 
 # This one will get filled with local migrations

diff --git a/mediagoblin/tests/test_staticdirect.py b/mediagoblin/tests/test_staticdirect.py
index 663ab68e833ea6c9b86db52a839419f09ca451a1..3a9e2fd9687220ef45978932802cf1fb2f857caf 100644 (file)
--- a/mediagoblin/tests/test_staticdirect.py
+++ b/mediagoblin/tests/test_staticdirect.py
@@ -1,8 +1,4 @@
 from mediagoblin.tools import staticdirect
-from mediagoblin.tools.testing import _activate_testing
-
-_activate_testing()
-
 
 def test_staticdirect():
     sdirect = staticdirect.StaticDirect(

diff --git a/mediagoblin/tests/test_storage.py b/mediagoblin/tests/test_storage.py
index e5bc00deefe4f56834b301587d5bdbfea124f3a7..f6f1d18f532004b9e4280638fab10e1dfc70554c 100644 (file)
--- a/mediagoblin/tests/test_storage.py
+++ b/mediagoblin/tests/test_storage.py
@@ -22,9 +22,6 @@ import pytest
 from werkzeug.utils import secure_filename
 
 from mediagoblin import storage
-from mediagoblin.tools.testing import _activate_testing
-
-_activate_testing()
 
 
 ################

diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py
index 69f867c0dca12e2280d209aa3769277bae04e27b..162b2d195f09eb762124507b380950ca294b76d1 100644 (file)
--- a/mediagoblin/tests/test_submission.py
+++ b/mediagoblin/tests/test_submission.py
@@ -28,15 +28,10 @@ from mediagoblin.db.models import MediaEntry
 from mediagoblin.tools import template
 from mediagoblin.media_types.image import MEDIA_MANAGER as img_MEDIA_MANAGER
 from mediagoblin.media_types.pdf.processing import check_prerequisites as pdf_check_prerequisites
-from mediagoblin.tools.testing import _activate_testing
-
-_activate_testing()
-
 
 from .resources import GOOD_JPG, GOOD_PNG, EVIL_FILE, EVIL_JPG, EVIL_PNG, \
     BIG_BLUE, GOOD_PDF, GPS_JPG
 
-
 GOOD_TAG_STRING = u'yin,yang'
 BAD_TAG_STRING = unicode('rage,' + 'f' * 26 + 'u' * 26)
 

diff --git a/mediagoblin/tests/test_tags.py b/mediagoblin/tests/test_tags.py
index 8e137b06871334a234eda1ba0d60a43362f9566a..e25cc283fe1184b19d9c53dd8c0dd940384e2f70 100644 (file)
--- a/mediagoblin/tests/test_tags.py
+++ b/mediagoblin/tests/test_tags.py
@@ -15,10 +15,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from mediagoblin.tools import text
-from mediagoblin.tools.testing import _activate_testing
-
-_activate_testing()
-
 
 def test_list_of_dicts_conversion(test_app):
     """

diff --git a/mediagoblin/tests/test_timesince.py b/mediagoblin/tests/test_timesince.py
index 0a25613ad41cef3589ebdb3e4dd59f7bd3d3ce6a..6579eb09d0ba2f31c996e161c4712b7e88874972 100644 (file)
--- a/mediagoblin/tests/test_timesince.py
+++ b/mediagoblin/tests/test_timesince.py
@@ -17,9 +17,6 @@
 from datetime import datetime, timedelta
 
 from mediagoblin.tools.timesince import is_aware, timesince
-from mediagoblin.tools.testing import _activate_testing
-
-_activate_testing()
 
 
 def test_timesince():

diff --git a/mediagoblin/tests/test_workbench.py b/mediagoblin/tests/test_workbench.py
index b9e99cbef8fd25207a8e7d7c05410b157f207e4e..6695618b562973d43f2830db8919c5c7338d2097 100644 (file)
--- a/mediagoblin/tests/test_workbench.py
+++ b/mediagoblin/tests/test_workbench.py
@@ -22,9 +22,6 @@ from mediagoblin.tools import workbench
 from mediagoblin.mg_globals import setup_globals
 from mediagoblin.decorators import get_workbench
 from mediagoblin.tests.test_storage import get_tmp_filestorage, cleanup_storage
-from mediagoblin.tools.testing import _activate_testing
-
-_activate_testing()
 
 
 class TestWorkbench(object):