Merge pull request #5346 from saadmk11/remove-pytest-warnings

Remove pytest warnings
readthedocs · Mar 5, 2019 · bdb4aa5 · bdb4aa5
2 parents 0917fbd + 68836e7
commit bdb4aa5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/conftest.py b/conftest.py
@@ -47,6 +47,12 @@ def pytest_configure(config):
 def settings_modification(settings):
  settings.CELERY_ALWAYS_EAGER = True
 
+
 @pytest.fixture
 def api_client():
  return APIClient()
+
+
+@pytest.fixture(scope="class")
+def url_scheme(request):
+ request.cls.url_scheme = request.config.option.url_scheme
diff --git a/readthedocs/rtd_tests/tests/test_core_tags.py b/readthedocs/rtd_tests/tests/test_core_tags.py
@@ -9,13 +9,14 @@
 from readthedocs.projects.models import Project
 
 
+@pytest.mark.usefixtures("url_scheme")
 @override_settings(USE_SUBDOMAIN=False, PRODUCTION_DOMAIN='readthedocs.org')
 class CoreTagsTests(TestCase):
  fixtures = ['eric', 'test_data']
 
  def setUp(self):
  url_base = '{scheme}://{domain}/docs/pip{{version}}'.format(
- scheme=pytest.config.option.url_scheme,
+ scheme=self.url_scheme,
  domain=settings.PRODUCTION_DOMAIN,
  )