2 files changed, 0 insertions, 41 deletions
diff --git a/mediagoblin/plugins/subtitles/pytest.ini b/mediagoblin/plugins/subtitles/pytest.ini
deleted file mode 100644
index a823ca23..00000000
--- a/mediagoblin/plugins/subtitles/pytest.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[pytest]
-usefixtures = tmpdir pt_fixture_enable_testing
-addopts = --tb=native
-\ No newline at end of file
diff --git a/mediagoblin/plugins/subtitles/tests/conftest.py b/mediagoblin/plugins/subtitles/tests/conftest.py
deleted file mode 100644
index eeee5fb3..00000000
--- a/mediagoblin/plugins/subtitles/tests/conftest.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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
-import pkg_resources
-
-from mediagoblin.tests import tools
-from mediagoblin.tools.testing import _activate_testing
-
-
-@pytest.fixture()
-def test_app(request):
-    return tools.get_app(
-        request,
-        mgoblin_config=pkg_resources.resource_filename(
-            'mediagoblin.plugins.subtitles','pytest.ini'))
-
-
-@pytest.fixture()
-def pt_fixture_enable_testing():
-    """
-    py.test fixture to enable testing mode in tools.
-    """
-    _activate_testing()
-