17 files changed, 348 insertions, 45 deletions
diff --git a/mediagoblin/tests/__init__.py b/mediagoblin/tests/__init__.py
index 5a3235c6..7a88281e 100644
--- a/mediagoblin/tests/__init__.py
+++ b/mediagoblin/tests/__init__.py
@@ -18,12 +18,10 @@ import os
 import shutil
 
 from mediagoblin import mg_globals
-from mediagoblin.tests.tools import (
-    TEST_USER_DEV, suicide_if_bad_celery_environ)
+from mediagoblin.tests.tools import TEST_USER_DEV
 
 
 def setup_package():
-    suicide_if_bad_celery_environ()
 
     import warnings
     from sqlalchemy.exc import SAWarning
diff --git a/mediagoblin/tests/appconfig_context_modified.ini b/mediagoblin/tests/appconfig_context_modified.ini
new file mode 100644
index 00000000..e93797df
--- /dev/null
+++ b/mediagoblin/tests/appconfig_context_modified.ini
@@ -0,0 +1,26 @@
+[mediagoblin]
+direct_remote_path = /test_static/
+email_sender_address = "notice@mediagoblin.example.org"
+email_debug_mode = true
+
+# TODO: Switch to using an in-memory database
+sql_engine = "sqlite:///%(here)s/test_user_dev/mediagoblin.db"
+
+# Celery shouldn't be set up by the application as it's setup via
+# mediagoblin.init.celery.from_celery
+celery_setup_elsewhere = true
+
+[storage:publicstore]
+base_dir = %(here)s/test_user_dev/media/public
+base_url = /mgoblin_media/
+
+[storage:queuestore]
+base_dir = %(here)s/test_user_dev/media/queue
+
+[celery]
+CELERY_ALWAYS_EAGER = true
+CELERY_RESULT_DBURI = "sqlite:///%(here)s/test_user_dev/celery.db"
+BROKER_HOST = "sqlite:///%(here)s/test_user_dev/kombu.db"
+
+[plugins]
+[[mediagoblin.tests.testplugins.modify_context]]
diff --git a/mediagoblin/tests/appconfig_plugin_specs.ini b/mediagoblin/tests/appconfig_plugin_specs.ini
new file mode 100644
index 00000000..5511cd97
--- /dev/null
+++ b/mediagoblin/tests/appconfig_plugin_specs.ini
@@ -0,0 +1,21 @@
+[mediagoblin]
+direct_remote_path = /mgoblin_static/
+email_sender_address = "notice@mediagoblin.example.org"
+
+## Uncomment and change to your DB's appropiate setting.
+## Default is a local sqlite db "mediagoblin.db".
+# sql_engine = postgresql:///gmg
+
+# set to false to enable sending notices
+email_debug_mode = true
+
+# Set to false to disable registrations
+allow_registration = true
+
+[plugins]
+[[mediagoblin.tests.testplugins.pluginspec]]
+some_string = "not blork"
+some_int = "not an int"
+
+# this one shouldn't have its own config
+[[mediagoblin.tests.testplugins.callables1]]
diff --git a/mediagoblin/tests/conftest.py b/mediagoblin/tests/conftest.py
index 25f495d6..dbb0aa0a 100644
--- a/mediagoblin/tests/conftest.py
+++ b/mediagoblin/tests/conftest.py
@@ -1,7 +1,25 @@
-from mediagoblin.tests import tools
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2013 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/>.
 
 import pytest
 
+from mediagoblin.tests import tools
+from mediagoblin.tools.testing import _activate_testing
+
+
 @pytest.fixture()
 def test_app(request):
     """
@@ -13,3 +31,11 @@ def test_app(request):
     in differently to get_app.
     """
     return tools.get_app(request)
+
+
+@pytest.fixture()
+def pt_fixture_enable_testing():
+    """
+    py.test fixture to enable testing mode in tools.
+    """
+    _activate_testing()
diff --git a/mediagoblin/tests/pytest.ini b/mediagoblin/tests/pytest.ini
index d4aa2d69..e561c074 100644
--- a/mediagoblin/tests/pytest.ini
+++ b/mediagoblin/tests/pytest.ini
@@ -1,2 +1,2 @@
 [pytest]
-usefixtures = tmpdir
-\ No newline at end of file
+usefixtures = tmpdir pt_fixture_enable_testing
diff --git a/mediagoblin/tests/test_messages.py b/mediagoblin/tests/test_messages.py
index 3ac917b0..22f9e800 100644
--- a/mediagoblin/tests/test_messages.py
+++ b/mediagoblin/tests/test_messages.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.messages import fetch_messages, add_message
+from mediagoblin import messages
 from mediagoblin.tools import template
 
 
@@ -32,11 +32,19 @@ def test_messages(test_app):
     # The message queue should be empty
     assert request.session.get('messages', []) == []
 
+    # First of all, we should clear the messages queue
+    messages.clear_add_message()
     # Adding a message should modify the session accordingly
-    add_message(request, 'herp_derp', 'First!')
+    messages.add_message(request, 'herp_derp', 'First!')
     test_msg_queue = [{'text': 'First!', 'level': 'herp_derp'}]
-    assert request.session['messages'] == test_msg_queue
+
+    # Alternative tests to the following, test divided in two steps:
+    # assert request.session['messages'] == test_msg_queue
+    # 1. Tests if add_message worked
+    assert messages.ADD_MESSAGE_TEST[-1] == test_msg_queue
+    # 2. Tests if add_message updated session information
+    assert messages.ADD_MESSAGE_TEST[-1] == request.session['messages']
 
     # fetch_messages should return and empty the queue
-    assert fetch_messages(request) == test_msg_queue
+    assert messages.fetch_messages(request) == test_msg_queue
     assert request.session.get('messages') == []
diff --git a/mediagoblin/tests/test_mgoblin_app.ini b/mediagoblin/tests/test_mgoblin_app.ini
index 9f95a398..2e876812 100644
--- a/mediagoblin/tests/test_mgoblin_app.ini
+++ b/mediagoblin/tests/test_mgoblin_app.ini
@@ -12,10 +12,6 @@ tags_max_length = 50
 # So we can start to test attachments:
 allow_attachments = True
 
-# Celery shouldn't be set up by the application as it's setup via
-# mediagoblin.init.celery.from_celery
-celery_setup_elsewhere = true
-
 media_types = mediagoblin.media_types.image, mediagoblin.media_types.pdf
 
 [storage:publicstore]
@@ -34,4 +30,4 @@ BROKER_HOST = "sqlite:///%(here)s/test_user_dev/kombu.db"
 [[mediagoblin.plugins.api]]
 [[mediagoblin.plugins.oauth]]
 [[mediagoblin.plugins.httpapiauth]]
-
+[[mediagoblin.plugins.piwigo]]
diff --git a/mediagoblin/tests/test_piwigo.py b/mediagoblin/tests/test_piwigo.py
new file mode 100644
index 00000000..18f95057
--- /dev/null
+++ b/mediagoblin/tests/test_piwigo.py
@@ -0,0 +1,69 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2013 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/>.
+
+import pytest
+from .tools import fixture_add_user
+
+
+XML_PREFIX = "<?xml version='1.0' encoding='utf-8'?>\n"
+
+
+class Test_PWG(object):
+    @pytest.fixture(autouse=True)
+    def setup(self, test_app):
+        self.test_app = test_app
+
+        fixture_add_user()
+
+        self.username = u"chris"
+        self.password = "toast"
+
+    def do_post(self, method, params):
+        params["method"] = method
+        return self.test_app.post("/api/piwigo/ws.php", params)
+
+    def do_get(self, method, params=None):
+        if params is None:
+            params = {}
+        params["method"] = method
+        return self.test_app.get("/api/piwigo/ws.php", params)
+
+    def test_session(self):
+        resp = self.do_post("pwg.session.login",
+            {"username": u"nouser", "password": "wrong"})
+        assert resp.body ==  XML_PREFIX + '<rsp stat="ok">0</rsp>'
+
+        resp = self.do_post("pwg.session.login",
+            {"username": self.username, "password": "wrong"})
+        assert resp.body ==  XML_PREFIX + '<rsp stat="ok">0</rsp>'
+
+        resp = self.do_get("pwg.session.getStatus")
+        assert resp.body == XML_PREFIX \
+            + '<rsp stat="ok"><username>guest</username></rsp>'
+
+        resp = self.do_post("pwg.session.login",
+            {"username": self.username, "password": self.password})
+        assert resp.body ==  XML_PREFIX + '<rsp stat="ok">1</rsp>'
+
+        resp = self.do_get("pwg.session.getStatus")
+        assert resp.body == XML_PREFIX \
+            + '<rsp stat="ok"><username>chris</username></rsp>'
+
+        self.do_get("pwg.session.logout")
+
+        resp = self.do_get("pwg.session.getStatus")
+        assert resp.body == XML_PREFIX \
+            + '<rsp stat="ok"><username>guest</username></rsp>'
diff --git a/mediagoblin/tests/test_pluginapi.py b/mediagoblin/tests/test_pluginapi.py
index f03e868f..73ad235e 100644
--- a/mediagoblin/tests/test_pluginapi.py
+++ b/mediagoblin/tests/test_pluginapi.py
@@ -18,10 +18,14 @@ import sys
 
 from configobj import ConfigObj
 import pytest
+import pkg_resources
+from validate import VdtTypeError
 
 from mediagoblin import mg_globals
 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
 
 
 def with_cleanup(*modules_to_delete):
@@ -294,3 +298,63 @@ def test_hook_transform():
 
     assert pluginapi.hook_transform(
         "expand_tuple", (-1, 0)) == (-1, 0, 1, 2, 3)
+
+
+def test_plugin_config():
+    """
+    Make sure plugins can set up their own config
+    """
+    config, validation_result = read_mediagoblin_config(
+        pkg_resources.resource_filename(
+            'mediagoblin.tests', 'appconfig_plugin_specs.ini'))
+
+    pluginspec_section = config['plugins'][
+        'mediagoblin.tests.testplugins.pluginspec']
+    assert pluginspec_section['some_string'] == 'not blork'
+    assert pluginspec_section['dont_change_me'] == 'still the default'
+
+    # Make sure validation works... this should be an error
+    assert isinstance(
+        validation_result[
+            'plugins'][
+                'mediagoblin.tests.testplugins.pluginspec'][
+                    'some_int'],
+        VdtTypeError)
+
+    # the callables thing shouldn't really have anything though.
+    assert len(config['plugins'][
+        'mediagoblin.tests.testplugins.callables1']) == 0
+
+
+@pytest.fixture()
+def context_modified_app(request):
+    """
+    Get a MediaGoblin app fixture using appconfig_context_modified.ini
+    """
+    return get_app(
+        request,
+        mgoblin_config=pkg_resources.resource_filename(
+            'mediagoblin.tests', 'appconfig_context_modified.ini'))
+
+
+def test_modify_context(context_modified_app):
+    """
+    Test that we can modify both the view/template specific and
+    global contexts for templates.
+    """
+    # Specific thing passed into a page
+    result = context_modified_app.get("/modify_context/specific/")
+    assert result.body.strip() == """Specific page!
+
+specific thing: in yer specificpage
+global thing: globally appended!
+something: orother
+doubleme: happyhappy"""
+
+    # General test, should have global context variable only
+    result = context_modified_app.get("/modify_context/")
+    assert result.body.strip() == """General page!
+
+global thing: globally appended!
+lol: cats
+doubleme: joyjoy"""
diff --git a/mediagoblin/tests/test_processing.py b/mediagoblin/tests/test_processing.py
index fe8489aa..591add96 100644
--- a/mediagoblin/tests/test_processing.py
+++ b/mediagoblin/tests/test_processing.py
@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 
-from nose.tools import assert_equal
-
 from mediagoblin import processing
 
 class TestProcessing(object):
@@ -10,7 +8,7 @@ class TestProcessing(object):
         result = builder.fill(format)
         if output is None:
             return result
-        assert_equal(output, result)
+        assert output == result
         
     def test_easy_filename_fill(self):
         self.run_fill('/home/user/foo.TXT', '{basename}bar{ext}', 'foobar.txt')
diff --git a/mediagoblin/tests/testplugins/modify_context/__init__.py b/mediagoblin/tests/testplugins/modify_context/__init__.py
new file mode 100644
index 00000000..164e66c1
--- /dev/null
+++ b/mediagoblin/tests/testplugins/modify_context/__init__.py
@@ -0,0 +1,55 @@
+# 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 pluginapi
+import pkg_resources
+
+
+def append_to_specific_context(context):
+    context['specific_page_append'] = 'in yer specificpage'
+    return context
+
+def append_to_global_context(context):
+    context['global_append'] = 'globally appended!'
+    return context
+
+def double_doubleme(context):
+    if 'doubleme' in context:
+        context['doubleme'] = context['doubleme'] * 2
+    return context
+
+
+def setup_plugin():
+    routes = [
+        ('modify_context.specific_page',
+         '/modify_context/specific/',
+         'mediagoblin.tests.testplugins.modify_context.views:specific'),
+        ('modify_context.general_page',
+         '/modify_context/',
+         'mediagoblin.tests.testplugins.modify_context.views:general')]
+
+    pluginapi.register_routes(routes)
+    pluginapi.register_template_path(
+        pkg_resources.resource_filename(
+            'mediagoblin.tests.testplugins.modify_context', 'templates'))
+
+
+hooks = {
+    'setup': setup_plugin,
+    ('modify_context.specific_page',
+     'contextplugin/specific.html'): append_to_specific_context,
+    'template_global_context': append_to_global_context,
+    'template_context_prerender': double_doubleme}
diff --git a/mediagoblin/tests/testplugins/modify_context/templates/contextplugin/general.html b/mediagoblin/tests/testplugins/modify_context/templates/contextplugin/general.html
new file mode 100644
index 00000000..9cf96d3e
--- /dev/null
+++ b/mediagoblin/tests/testplugins/modify_context/templates/contextplugin/general.html
@@ -0,0 +1,5 @@
+General page!
+
+global thing: {{ global_append }}
+lol: {{ lol }}
+doubleme: {{ doubleme }}
diff --git a/mediagoblin/tests/testplugins/modify_context/templates/contextplugin/specific.html b/mediagoblin/tests/testplugins/modify_context/templates/contextplugin/specific.html
new file mode 100644
index 00000000..5b1b4c4a
--- /dev/null
+++ b/mediagoblin/tests/testplugins/modify_context/templates/contextplugin/specific.html
@@ -0,0 +1,6 @@
+Specific page!
+
+specific thing: {{ specific_page_append }}
+global thing: {{ global_append }}
+something: {{ something }}
+doubleme: {{ doubleme }}
diff --git a/mediagoblin/tests/testplugins/modify_context/views.py b/mediagoblin/tests/testplugins/modify_context/views.py
new file mode 100644
index 00000000..701ec6f9
--- /dev/null
+++ b/mediagoblin/tests/testplugins/modify_context/views.py
@@ -0,0 +1,33 @@
+# 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.response import render_to_response
+
+
+def specific(request):
+    return render_to_response(
+        request,
+        'contextplugin/specific.html',
+        {"something": "orother",
+         "doubleme": "happy"})
+
+
+def general(request):
+    return render_to_response(
+        request,
+        'contextplugin/general.html',
+        {"lol": "cats",
+         "doubleme": "joy"})
diff --git a/mediagoblin/tests/testplugins/pluginspec/__init__.py b/mediagoblin/tests/testplugins/pluginspec/__init__.py
new file mode 100644
index 00000000..76ca2b1f
--- /dev/null
+++ b/mediagoblin/tests/testplugins/pluginspec/__init__.py
@@ -0,0 +1,22 @@
+# 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/>.
+
+def setup_plugin():
+    pass
+
+hooks = {
+    'setup': setup_plugin,
+}
diff --git a/mediagoblin/tests/testplugins/pluginspec/config_spec.ini b/mediagoblin/tests/testplugins/pluginspec/config_spec.ini
new file mode 100644
index 00000000..5c9c3bd7
--- /dev/null
+++ b/mediagoblin/tests/testplugins/pluginspec/config_spec.ini
@@ -0,0 +1,4 @@
+[plugin_spec]
+some_string = string(default="blork")
+some_int = integer(default=50)
+dont_change_me = string(default="still the default")
+\ No newline at end of file
diff --git a/mediagoblin/tests/tools.py b/mediagoblin/tests/tools.py
index 52635e18..794ed940 100644
--- a/mediagoblin/tests/tools.py
+++ b/mediagoblin/tests/tools.py
@@ -33,7 +33,6 @@ from mediagoblin.db.base import Session
 from mediagoblin.meddleware import BaseMeddleware
 from mediagoblin.auth.lib import bcrypt_gen_password_hash
 from mediagoblin.gmg_commands.dbupdate import run_dbupdate
-from mediagoblin.init.celery import setup_celery_app
 
 
 MEDIAGOBLIN_TEST_DB_NAME = u'__mediagoblin_tests__'
@@ -47,16 +46,6 @@ TEST_USER_DEV = pkg_resources.resource_filename(
 
 USER_DEV_DIRECTORIES_TO_SETUP = ['media/public', 'media/queue']
 
-BAD_CELERY_MESSAGE = """\
-Sorry, you *absolutely* must run tests with the
-mediagoblin.init.celery.from_tests module.  Like so:
-
-$ CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_tests {0}
-""".format(sys.argv[0])
-
-
-class BadCeleryEnviron(Exception): pass
-
 
 class TestingMeddleware(BaseMeddleware):
     """
@@ -97,12 +86,6 @@ class TestingMeddleware(BaseMeddleware):
         return
 
 
-def suicide_if_bad_celery_environ():
-    if not os.environ.get('CELERY_CONFIG_MODULE') == \
-            'mediagoblin.init.celery.from_tests':
-        raise BadCeleryEnviron(BAD_CELERY_MESSAGE)
-
-
 def get_app(request, paste_config=None, mgoblin_config=None):
     """Create a MediaGoblin app for testing.
 
@@ -127,14 +110,6 @@ def get_app(request, paste_config=None, mgoblin_config=None):
     shutil.copyfile(paste_config, new_paste_config)
     shutil.copyfile(mgoblin_config, new_mgoblin_config)
 
-    suicide_if_bad_celery_environ()
-
-    # Make sure we've turned on testing
-    testing._activate_testing()
-
-    # Leave this imported as it sets up celery.
-    from mediagoblin.init.celery import from_tests
-
     Session.rollback()
     Session.remove()
 
@@ -154,9 +129,6 @@ def get_app(request, paste_config=None, mgoblin_config=None):
     test_app = loadapp(
         'config:' + new_paste_config)
 
-    # Re-setup celery
-    setup_celery_app(app_config, global_config)
-
     # Insert the TestingMeddleware, which can do some
     # sanity checks on every request/response.
     # Doing it this way is probably not the cleanest way.