From cd9dee013dc749a10bbe019c350e0e62b6635795 Mon Sep 17 00:00:00 2001 From: albert-github Date: Wed, 1 Jan 2020 17:51:53 +0100 Subject: issue #7464 1.8.17: test suite is failing On Windows the syntax with the command and arguments in one string worked but on *nix (and Cygwin) it didn't. - changed calls to Popen to split command (see also: https://docs.python.org/3/library/subprocess.html). - explicitly specify files to check for xhtml - changed call to xmllint for xhtml and docbook (due to stdout overflow in some cases, we are not really interested in the, formatted, output of xmllint). - in the update part a `read` was left, should have been removed. --- testing/runtests.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/testing/runtests.py b/testing/runtests.py index a4118b8..10fe502 100755 --- a/testing/runtests.py +++ b/testing/runtests.py @@ -3,6 +3,7 @@ from __future__ import print_function import argparse, glob, itertools, re, shutil, os, sys import subprocess +import shlex config_reg = re.compile('.*\/\/\s*(?P\S+):\s*(?P.*)$') @@ -28,10 +29,10 @@ def xpopen(cmd, cmd1="",encoding='utf-8-sig', getStderr=False): return os.popen(cmd).read() # Python 2 without encoding else: if (getStderr): - proc = subprocess.run(cmd1,encoding=encoding,capture_output=True) # Python 3 with encoding - return proc.stderr + proc = subprocess.Popen(shlex.split(cmd1),stdout=subprocess.PIPE,stderr=subprocess.PIPE,encoding=encoding) # Python 3 with encoding + return proc.stderr.read() else: - proc = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE,encoding=encoding) # Python 3 with encoding + proc = subprocess.Popen(shlex.split(cmd),stdout=subprocess.PIPE,stderr=subprocess.PIPE,encoding=encoding) # Python 3 with encoding return proc.stdout.read() class Tester: @@ -137,7 +138,7 @@ class Tester: print('GENERATE_DOCBOOK=NO', file=f) if (self.args.xhtml): print('GENERATE_HTML=YES', file=f) - # HTML_OUTPUT can also be set locally + # HTML_OUTPUT can also have been set locally print('HTML_OUTPUT=%s/html' % self.test_out, file=f) print('HTML_FILE_EXTENSION=.xhtml', file=f) if (self.args.pdf): @@ -184,7 +185,7 @@ class Tester: print('Non-existing file %s after \'check:\' statement' % check_file) return # convert output to canonical form - data = xpopen('%s --format --noblanks --nowarning %s' % (self.args.xmllint,check_file)).read() + data = xpopen('%s --format --noblanks --nowarning %s' % (self.args.xmllint,check_file)) if data: # strip version data = re.sub(r'xsd" version="[0-9.-]+"','xsd" version=""',data).rstrip('\n') @@ -326,7 +327,7 @@ class Tester: tests.append(glob.glob('%s/*.xml' % (docbook_output))) tests.append(glob.glob('%s/*/*/*.xml' % (docbook_output))) tests = ' '.join(list(itertools.chain.from_iterable(tests))).replace(self.args.outputdir +'/','').replace('\\','/') - exe_string = '%s --nonet --postvalid %s' % (self.args.xmllint,tests) + exe_string = '%s --noout --nonet --postvalid %s' % (self.args.xmllint,tests) exe_string1 = exe_string exe_string += ' %s' % (redirx) exe_string += ' %s more "%s/temp"' % (separ,docbook_output) @@ -346,7 +347,11 @@ class Tester: redirx=' 2> %s/temp >nul:'%html_output else: redirx='2>%s/temp >/dev/null'%html_output - exe_string = '%s --path dtd --nonet --postvalid %s/*xhtml' % (self.args.xmllint,html_output) + check_file = [] + check_file.append(glob.glob('%s/*.xhtml' % (html_output))) + check_file.append(glob.glob('%s/*/*/*.xhtml' % (html_output))) + check_file = ' '.join(list(itertools.chain.from_iterable(check_file))).replace(self.args.outputdir +'/','').replace('\\','/') + exe_string = '%s --noout --path dtd --nonet --postvalid %s' % (self.args.xmllint,check_file) exe_string1 = exe_string exe_string += ' %s' % (redirx) exe_string += ' %s more "%s/temp"' % (separ,html_output) -- cgit v0.12