Rename get_test_app to get_app.

nosetests runs everything that even vaguely looks like a
test case... even our get_test_app. And as it is imported
everywhere... it is run everywhere as a test case. Renaming
it saves us about 10+ tests and a few seconds of time.

diff --git a/mediagoblin/tests/test_api.py b/mediagoblin/tests/test_api.py
index 4b784da36422a731c7a85b82d51ccaf0a22069be..82b1c1b4a6e06ca716bfdb97a36c66bde884d24f 100644 (file)
--- a/mediagoblin/tests/test_api.py
+++ b/mediagoblin/tests/test_api.py
@@ -22,7 +22,7 @@ from pkg_resources import resource_filename
 
 from mediagoblin import mg_globals
 from mediagoblin.tools import template, pluginapi
-from mediagoblin.tests.tools import get_test_app, fixture_add_user
+from mediagoblin.tests.tools import get_app, fixture_add_user
 
 
 _log = logging.getLogger(__name__)
@@ -44,7 +44,7 @@ BIG_BLUE = resource('bigblue.png')
 
 class TestAPI(object):
     def setUp(self):
-        self.app = get_test_app(dump_old_app=False)
+        self.app = get_app(dump_old_app=False)
         self.db = mg_globals.database
 
         self.user_password = u'4cc355_70k3N'

diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py
index a40c9cbc55f4a87bfd134ebb2e95bdde111acfdf..103bea6b5196970dc7b138546f46f76c822339b7 100644 (file)
--- a/mediagoblin/tests/test_auth.py
+++ b/mediagoblin/tests/test_auth.py
@@ -22,7 +22,7 @@ from nose.tools import assert_equal
 from mediagoblin import mg_globals
 from mediagoblin.auth import lib as auth_lib
 from mediagoblin.db.models import User
-from mediagoblin.tests.tools import get_test_app, fixture_add_user
+from mediagoblin.tests.tools import setup_fresh_app, get_app, fixture_add_user
 from mediagoblin.tools import template, mail
 
 
@@ -67,11 +67,11 @@ def test_bcrypt_gen_password_hash():
         'notthepassword', hashed_pw, '3><7R45417')
 
 
-def test_register_views():
+@setup_fresh_app
+def test_register_views(test_app):
     """
     Massive test function that all our registration-related views all work.
     """
-    test_app = get_test_app(dump_old_app=False)
     # Test doing a simple GET on the page
     # -----------------------------------
 
@@ -125,7 +125,7 @@ def test_register_views():
         u'Invalid email address.']
 
     ## At this point there should be no users in the database ;)
-    assert not User.query.count()
+    assert_equal(User.query.count(), 0)
 
     # Successful register
     # -------------------
@@ -315,7 +315,7 @@ def test_authentication_views():
     """
     Test logging in and logging out
     """
-    test_app = get_test_app(dump_old_app=False)
+    test_app = get_app(dump_old_app=False)
     # Make a new user
     test_user = fixture_add_user(active_user=False)
 

diff --git a/mediagoblin/tests/test_csrf_middleware.py b/mediagoblin/tests/test_csrf_middleware.py
index 22a0eb04dbd8d02c59fbe4a358c503e34b02c4ef..e720264cb6a146f676ff25d4b63e9c50eec15103 100644 (file)
--- a/mediagoblin/tests/test_csrf_middleware.py
+++ b/mediagoblin/tests/test_csrf_middleware.py
@@ -14,12 +14,12 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from mediagoblin.tests.tools import get_test_app
+from mediagoblin.tests.tools import get_app
 from mediagoblin import mg_globals
 
 
 def test_csrf_cookie_set():
-    test_app = get_test_app(dump_old_app=False)
+    test_app = get_app(dump_old_app=False)
     cookie_name = mg_globals.app_config['csrf_cookie_name']
 
     # get login page
@@ -37,7 +37,7 @@ def test_csrf_token_must_match():
     # We need a fresh app for this test on webtest < 1.3.6.
     # We do not understand why, but it fixes the tests.
     # If we require webtest >= 1.3.6, we can switch to a non fresh app here.
-    test_app = get_test_app(dump_old_app=True)
+    test_app = get_app(dump_old_app=True)
 
     # construct a request with no cookie or form token
     assert test_app.post('/auth/login/',
@@ -68,7 +68,7 @@ def test_csrf_token_must_match():
                          status_int == 200
 
 def test_csrf_exempt():
-    test_app = get_test_app(dump_old_app=False)
+    test_app = get_app(dump_old_app=False)
     # monkey with the views to decorate a known endpoint
     import mediagoblin.auth.views
     from mediagoblin.meddleware.csrf import csrf_exempt

diff --git a/mediagoblin/tests/test_edit.py b/mediagoblin/tests/test_edit.py
index 4bea9243fd426dc2d7bb928b8d2a2db07074ef18..7db6eaea97f6c533e1e4a17027c1f2cdfcac0c62 100644 (file)
--- a/mediagoblin/tests/test_edit.py
+++ b/mediagoblin/tests/test_edit.py
@@ -18,13 +18,13 @@ from nose.tools import assert_equal
 
 from mediagoblin import mg_globals
 from mediagoblin.db.models import User
-from mediagoblin.tests.tools import get_test_app, fixture_add_user
+from mediagoblin.tests.tools import get_app, fixture_add_user
 from mediagoblin.tools import template
 from mediagoblin.auth.lib import bcrypt_check_password
 
 class TestUserEdit(object):
     def setUp(self):
-        self.app = get_test_app(dump_old_app=False)
+        self.app = get_app(dump_old_app=False)
         # set up new user
         self.user_password = u'toast'
         self.user = fixture_add_user(password = self.user_password)

diff --git a/mediagoblin/tests/test_http_callback.py b/mediagoblin/tests/test_http_callback.py
index 0f6e489f396ab96b1b291dca6e2e2b34441e0802..8bee7045cd69df0844bf39a0711d296cb28d0d04 100644 (file)
--- a/mediagoblin/tests/test_http_callback.py
+++ b/mediagoblin/tests/test_http_callback.py
@@ -20,14 +20,14 @@ from urlparse import urlparse, parse_qs
 
 from mediagoblin import mg_globals
 from mediagoblin.tools import processing
-from mediagoblin.tests.tools import get_test_app, fixture_add_user
+from mediagoblin.tests.tools import get_app, fixture_add_user
 from mediagoblin.tests.test_submission import GOOD_PNG
 from mediagoblin.tests import test_oauth as oauth
 
 
 class TestHTTPCallback(object):
     def setUp(self):
-        self.app = get_test_app(dump_old_app=False)
+        self.app = get_app(dump_old_app=False)
         self.db = mg_globals.database
 
         self.user_password = u'secret'

diff --git a/mediagoblin/tests/test_messages.py b/mediagoblin/tests/test_messages.py
index c587e5995d85dd4d12cabe759b76e268a64056ee..4c0f3e2e0579e25a6fc99df40dcd94f2a2ede12f 100644 (file)
--- a/mediagoblin/tests/test_messages.py
+++ b/mediagoblin/tests/test_messages.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from mediagoblin.messages import fetch_messages, add_message
-from mediagoblin.tests.tools import get_test_app
+from mediagoblin.tests.tools import get_app
 from mediagoblin.tools import template
 
 
@@ -26,7 +26,7 @@ def test_messages():
     fetched messages should be the same as the added ones,
     and fetching should clear the message list.
     """
-    test_app = get_test_app(dump_old_app=False)
+    test_app = get_app(dump_old_app=False)
     # Aquire a request object
     test_app.get('/')
     context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/root.html']

diff --git a/mediagoblin/tests/test_misc.py b/mediagoblin/tests/test_misc.py
index 8a96e7d0087d12a158073737c3e6f35ad44be8a3..ae5d7e504a1bd5110192abef3248e5c9c4a5ab0d 100644 (file)
--- a/mediagoblin/tests/test_misc.py
+++ b/mediagoblin/tests/test_misc.py
@@ -16,9 +16,9 @@
 
 from nose.tools import assert_equal
 
-from mediagoblin.tests.tools import get_test_app
+from mediagoblin.tests.tools import get_app
 
 def test_404_for_non_existent():
-    test_app = get_test_app(dump_old_app=False)
+    test_app = get_app(dump_old_app=False)
     res = test_app.get('/does-not-exist/', expect_errors=True)
     assert_equal(res.status_int, 404)

diff --git a/mediagoblin/tests/test_oauth.py b/mediagoblin/tests/test_oauth.py
index a72f766ec5500ef5a0e2604bbb9263b02d926b09..94ba5dab7d42156dacf269d9ea65244536355607 100644 (file)
--- a/mediagoblin/tests/test_oauth.py
+++ b/mediagoblin/tests/test_oauth.py
@@ -21,7 +21,7 @@ from urlparse import parse_qs, urlparse
 
 from mediagoblin import mg_globals
 from mediagoblin.tools import template, pluginapi
-from mediagoblin.tests.tools import get_test_app, fixture_add_user
+from mediagoblin.tests.tools import get_app, fixture_add_user
 
 
 _log = logging.getLogger(__name__)
@@ -29,7 +29,7 @@ _log = logging.getLogger(__name__)
 
 class TestOAuth(object):
     def setUp(self):
-        self.app = get_test_app()
+        self.app = get_app()
         self.db = mg_globals.database
 
         self.pman = pluginapi.PluginManager()

diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py
index 53330c48ed2efe67dc860844aee15f1bd54b03ce..606c0e270d56cc7e27f54d9612a4428b5429c335 100644 (file)
--- a/mediagoblin/tests/test_submission.py
+++ b/mediagoblin/tests/test_submission.py
@@ -24,7 +24,7 @@ import os
 from nose.tools import assert_equal, assert_true
 from pkg_resources import resource_filename
 
-from mediagoblin.tests.tools import get_test_app, \
+from mediagoblin.tests.tools import get_app, \
     fixture_add_user
 from mediagoblin import mg_globals
 from mediagoblin.tools import template
@@ -50,7 +50,7 @@ REQUEST_CONTEXT = ['mediagoblin/user_pages/user.html', 'request']
 
 class TestSubmission:
     def setUp(self):
-        self.test_app = get_test_app(dump_old_app=False)
+        self.test_app = get_app(dump_old_app=False)
 
         # TODO: Possibly abstract into a decorator like:
         # @as_authenticated_user('chris')

diff --git a/mediagoblin/tests/test_tags.py b/mediagoblin/tests/test_tags.py
index 73af2eeaeece431ba043fbb0b4a6eadb0e789ec4..ccb930854047fe71b77621eec5ba802fb4457656 100644 (file)
--- a/mediagoblin/tests/test_tags.py
+++ b/mediagoblin/tests/test_tags.py
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from mediagoblin.tests.tools import get_test_app
+from mediagoblin.tests.tools import get_app
 from mediagoblin.tools import text
 
 def test_list_of_dicts_conversion():
@@ -24,7 +24,7 @@ def test_list_of_dicts_conversion():
     as a dict. Each tag dict should contain the tag's name and slug. Another
     function performs the reverse operation when populating a form to edit tags.
     """
-    test_app = get_test_app(dump_old_app=False)
+    test_app = get_app(dump_old_app=False)
     # Leading, trailing, and internal whitespace should be removed and slugified
     assert text.convert_to_tag_list_of_dicts('sleep , 6    AM, chainsaw! ') == [
                               {'name': u'sleep', 'slug': u'sleep'},

diff --git a/mediagoblin/tests/test_tests.py b/mediagoblin/tests/test_tests.py
index d09e8f284bc21774427c727a9a69b810d02f09ce..d539f1e0f6b28957bb88abbcbcddbbcec95abfd7 100644 (file)
--- a/mediagoblin/tests/test_tests.py
+++ b/mediagoblin/tests/test_tests.py
@@ -15,22 +15,22 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from mediagoblin import mg_globals
-from mediagoblin.tests.tools import get_test_app, fixture_add_user
+from mediagoblin.tests.tools import get_app, fixture_add_user
 from mediagoblin.db.models import User
 
 
-def test_get_test_app_wipes_db():
+def test_get_app_wipes_db():
     """
     Make sure we get a fresh database on every wipe :)
     """
-    get_test_app(dump_old_app=True)
+    get_app(dump_old_app=True)
     assert User.query.count() == 0
 
     fixture_add_user()
     assert User.query.count() == 1
 
-    get_test_app(dump_old_app=False)
+    get_app(dump_old_app=False)
     assert User.query.count() == 1
 
-    get_test_app(dump_old_app=True)
+    get_app(dump_old_app=True)
     assert User.query.count() == 0

diff --git a/mediagoblin/tests/tools.py b/mediagoblin/tests/tools.py
index 3e78b2e3bffcf64b9f039e19125b0ce52092c966..30218edec50efb5d602cf640515e414d7c83566e 100644 (file)
--- a/mediagoblin/tests/tools.py
+++ b/mediagoblin/tests/tools.py
@@ -103,7 +103,7 @@ def suicide_if_bad_celery_environ():
         raise BadCeleryEnviron(BAD_CELERY_MESSAGE)
 
 
-def get_test_app(dump_old_app=True):
+def get_app(dump_old_app=True):
     suicide_if_bad_celery_environ()
 
     # Make sure we've turned on testing
@@ -164,7 +164,7 @@ def setup_fresh_app(func):
     """
     @wraps(func)
     def wrapper(*args, **kwargs):
-        test_app = get_test_app()
+        test_app = get_app()
         testing.clear_test_buckets()
         return func(test_app, *args, **kwargs)