From afcc7f4626bde13f87d2aff1e1ae2c7e858f0279 Mon Sep 17 00:00:00 2001
From: Hong Xu <hong@topbug.net>
Date: Fri, 15 Jan 2016 01:48:49 -0800
Subject: [PATCH] Move the testing code which spawns pdflatex to a function

There are currently two locations in the testing code running the same
code to spawn pdflatex. This commit puts these code into one single
function to reduce redundancy.
---
 tests/test_build_latex.py | 61 ++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 36 deletions(-)

diff --git a/tests/test_build_latex.py b/tests/test_build_latex.py
index 5c8cb3438..76a7c7031 100644
--- a/tests/test_build_latex.py
+++ b/tests/test_build_latex.py
@@ -33,6 +33,29 @@ if PY3:
     LATEX_WARNINGS = remove_unicode_literals(LATEX_WARNINGS)
 
 
+def run_latex(outdir):
+    """Run pdflatex, xelatex, and lualatex in the outdir"""
+    cwd = os.getcwd()
+    os.chdir(outdir)
+    try:
+        for latex in ('pdflatex', 'xelatex', 'lualatex'):
+            try:
+                os.mkdir(latex)
+                p = Popen([latex, '--interaction=nonstopmode',
+                        '-output-directory=%s' % latex, 'SphinxTests.tex'],
+                        stdout=PIPE, stderr=PIPE)
+            except OSError:
+                raise SkipTest  # most likely pdflatex was not found
+            else:
+                stdout, stderr = p.communicate()
+                if p.returncode != 0:
+                    print(stdout)
+                    print(stderr)
+                    assert False, '%s exited with return code %s' % (
+                        latex, p.returncode)
+    finally:
+        os.chdir(cwd)
+
 @with_app(buildername='latex', freshenv=True)  # use freshenv to check warnings
 def test_latex(app, status, warning):
     LaTeXTranslator.ignore_missing_images = True
@@ -74,25 +97,7 @@ def test_latex(app, status, warning):
                            'seem to be installed' % filename)
 
     # now, try to run latex over it
-    cwd = os.getcwd()
-    os.chdir(app.outdir)
-    try:
-        for latex in ('pdflatex', 'xelatex', 'lualatex'):
-            try:
-                os.mkdir(latex)
-                p = Popen([latex, '--interaction=nonstopmode',
-                        '-output-directory=%s' % latex, 'SphinxTests.tex'],
-                        stdout=PIPE, stderr=PIPE)
-            except OSError:
-                raise SkipTest  # most likely pdflatex was not found
-            else:
-                stdout, stderr = p.communicate()
-                if p.returncode != 0:
-                    print(stdout)
-                    print(stderr)
-                    assert False, 'latex exited with return code %s' % p.returncode
-    finally:
-        os.chdir(cwd)
+    run_latex(app.outdir)
 
 
 @with_app(buildername='latex', freshenv=True,  # use freshenv to check warnings
@@ -141,23 +146,7 @@ def test_latex_howto(app, status, warning):
                            'seem to be installed' % filename)
 
     # now, try to run latex over it
-    cwd = os.getcwd()
-    os.chdir(app.outdir)
-    try:
-        try:
-            p = Popen(['pdflatex', '--interaction=nonstopmode',
-                       'SphinxTests.tex'], stdout=PIPE, stderr=PIPE)
-        except OSError:
-            raise SkipTest  # most likely pdflatex was not found
-        else:
-            stdout, stderr = p.communicate()
-            if p.returncode != 0:
-                print(stdout)
-                print(stderr)
-                app.cleanup()
-                assert False, 'latex exited with return code %s' % p.returncode
-    finally:
-        os.chdir(cwd)
+    run_latex(app.outdir)
 
 
 @with_app(buildername='latex', testroot='numfig',