Skip to content

Commit 09f9722

Browse files
ericholscheragjohnson
authored andcommitted
Fix config wrapper test on py3
1 parent 61b667e commit 09f9722

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

readthedocs/rtd_tests/tests/test_config_wrapper.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
from django.test import TestCase
44
from django_dynamic_fixture import get
55

6-
import six
7-
86
from readthedocs_build.config import BuildConfig, ProjectConfig, InvalidConfig
97
from readthedocs.builds.models import Version
108
from readthedocs.projects.models import Project
11-
from readthedocs.doc_builder.config import ConfigWrapper, load_yaml_config
9+
from readthedocs.doc_builder.config import load_yaml_config
1210

1311

1412
def create_load(config=None):
@@ -128,7 +126,7 @@ def test_python_invalid_version_in_config(self, load_config):
128126
self.project.container_image = 'readthedocs/build:2.0'
129127
self.project.save()
130128
with self.assertRaises(InvalidConfig):
131-
config = load_yaml_config(self.version)
129+
load_yaml_config(self.version)
132130

133131
def test_install_project(self, load_config):
134132
load_config.side_effect = create_load()
@@ -189,11 +187,7 @@ def test_conda(self, load_config):
189187
self.assertEqual(config.conda_file, None)
190188

191189
def test_requirements_file(self, load_config):
192-
if six.PY3:
193-
import pytest
194-
pytest.xfail("test_requirements_file is known to fail on 3.6")
195-
196-
requirements_file = 'wsgi.py' if six.PY2 else 'readthedocs/wsgi.py'
190+
requirements_file = 'wsgi.py'
197191
load_config.side_effect = create_load({
198192
'requirements_file': requirements_file
199193
})

0 commit comments

Comments
 (0)