3 files changed, 31 insertions, 53 deletions
diff --git a/mediagoblin/tests/test_cache.py b/mediagoblin/tests/test_cache.py
deleted file mode 100644
index 403173cd..00000000
--- a/mediagoblin/tests/test_cache.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# 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 import mg_globals
-
-
-DATA_TO_CACHE = {
-    'herp': 'derp',
-    'lol': 'cats'}
-
-
-def _get_some_data(key):
-    """
-    Stuid function that makes use of some caching.
-    """
-    some_data_cache = mg_globals.cache.get_cache('sum_data')
-    if some_data_cache.has_key(key):
-        return some_data_cache.get(key)
-
-    value = DATA_TO_CACHE.get(key)
-    some_data_cache.put(key, value)
-    return value
-
-
-def test_cache_working(test_app):
-    some_data_cache = mg_globals.cache.get_cache('sum_data')
-    assert not some_data_cache.has_key('herp')
-    assert _get_some_data('herp') == 'derp'
-    assert some_data_cache.get('herp') == 'derp'
-    # should get the same value again
-    assert _get_some_data('herp') == 'derp'
-
-    # now we force-change it, but the function should use the cached
-    # version
-    some_data_cache.put('herp', 'pred')
-    assert _get_some_data('herp') == 'pred'
diff --git a/mediagoblin/tests/test_session.py b/mediagoblin/tests/test_session.py
new file mode 100644
index 00000000..78d790eb
--- /dev/null
+++ b/mediagoblin/tests/test_session.py
@@ -0,0 +1,30 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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.tools import session
+
+def test_session():
+    sess = session.Session()
+    assert not sess
+    assert not sess.is_updated()
+    sess['user_id'] = 27
+    assert sess
+    assert not sess.is_updated()
+    sess.save()
+    assert sess.is_updated()
+    sess.delete()
+    assert not sess
+    assert sess.is_updated()
diff --git a/mediagoblin/tests/tools.py b/mediagoblin/tests/tools.py
index f7025715..a0498a6e 100644
--- a/mediagoblin/tests/tools.py
+++ b/mediagoblin/tests/tools.py
@@ -45,9 +45,7 @@ TEST_USER_DEV = pkg_resources.resource_filename(
     'mediagoblin.tests', 'test_user_dev')
 
 
-USER_DEV_DIRECTORIES_TO_SETUP = [
-    'media/public', 'media/queue',
-    'beaker/sessions/data', 'beaker/sessions/lock']
+USER_DEV_DIRECTORIES_TO_SETUP = ['media/public', 'media/queue']
 
 BAD_CELERY_MESSAGE = """\
 Sorry, you *absolutely* must run tests with the