diff options
author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-05-17 11:13:17 -0500 |
---|---|---|
committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-05-17 11:13:17 -0500 |
commit | b69dd853049fd7560542b47bac73675b33c78364 (patch) | |
tree | 23114fec510a1a169f1ffe5d2374efc6a417c804 | |
parent | 9a9bafc078192317695a4f06233ea261fe147989 (diff) | |
parent | 5fa843f31fc5cc95586f23badc8a06eba4fae5b4 (diff) | |
download | mediagoblin-b69dd853049fd7560542b47bac73675b33c78364.tar.lz mediagoblin-b69dd853049fd7560542b47bac73675b33c78364.tar.xz mediagoblin-b69dd853049fd7560542b47bac73675b33c78364.zip |
Merge remote-tracking branch 'refs/remotes/elrond/misc/pytest_enable_testing'
-rw-r--r-- | mediagoblin/tests/conftest.py | 28 | ||||
-rw-r--r-- | mediagoblin/tests/pytest.ini | 2 |
2 files changed, 28 insertions, 2 deletions
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 |