Skip to content

Commit 1b2c965

Browse files
ericholscheragjohnson
authored andcommitted
Fix celery tests
1 parent 09f9722 commit 1b2c965

File tree

1 file changed

+10
-18
lines changed

1 file changed

+10
-18
lines changed

readthedocs/rtd_tests/tests/test_builds.py

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,6 @@ def test_builder_no_comments(self):
157157

158158
def test_build_pdf_latex_failures(self):
159159
'''Build failure if latex fails'''
160-
if six.PY3:
161-
import pytest
162-
pytest.xfail(
163-
"test_build_pdf_latex_failures is known to fail on 3.6")
164160

165161
self.mocks.patches['html_build'].stop()
166162
self.mocks.patches['pdf_build'].stop()
@@ -183,11 +179,11 @@ def test_build_pdf_latex_failures(self):
183179

184180
# Mock out the separate calls to Popen using an iterable side_effect
185181
returns = [
186-
(('', ''), 0), # sphinx-build html
187-
(('', ''), 0), # sphinx-build pdf
188-
(('', ''), 1), # latex
189-
(('', ''), 0), # makeindex
190-
(('', ''), 0), # latex
182+
((b'', b''), 0), # sphinx-build html
183+
((b'', b''), 0), # sphinx-build pdf
184+
((b'', b''), 1), # latex
185+
((b'', b''), 0), # makeindex
186+
((b'', b''), 0), # latex
191187
]
192188
mock_obj = mock.Mock()
193189
mock_obj.communicate.side_effect = [output for (output, status)
@@ -203,10 +199,6 @@ def test_build_pdf_latex_failures(self):
203199

204200
def test_build_pdf_latex_not_failure(self):
205201
'''Test pass during PDF builds and bad latex failure status code'''
206-
if six.PY3:
207-
import pytest
208-
pytest.xfail(
209-
"test_build_pdf_latex_not_failure is known to fail on 3.6")
210202

211203
self.mocks.patches['html_build'].stop()
212204
self.mocks.patches['pdf_build'].stop()
@@ -229,11 +221,11 @@ def test_build_pdf_latex_not_failure(self):
229221

230222
# Mock out the separate calls to Popen using an iterable side_effect
231223
returns = [
232-
(('', ''), 0), # sphinx-build html
233-
(('', ''), 0), # sphinx-build pdf
234-
(('Output written on foo.pdf', ''), 1), # latex
235-
(('', ''), 0), # makeindex
236-
(('', ''), 0), # latex
224+
((b'', b''), 0), # sphinx-build html
225+
((b'', b''), 0), # sphinx-build pdf
226+
((b'Output written on foo.pdf', b''), 1), # latex
227+
((b'', b''), 0), # makeindex
228+
((b'', b''), 0), # latex
237229
]
238230
mock_obj = mock.Mock()
239231
mock_obj.communicate.side_effect = [output for (output, status)

0 commit comments

Comments
 (0)