3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test_klippy: Default to only showing log information on an error 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2018-06-17 11:48:06 -04:00
parent c89983fd96
commit 711a69396f
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
scripts/test_klippy.py
View File

@ -5,6 +5,9 @@
# This file may be distributed under the terms of the GNU GPLv3 license. # This file may be distributed under the terms of the GNU GPLv3 license.
import sys, os, optparse, logging, subprocess import sys, os, optparse, logging, subprocess
TEMP_GCODE_FILE = "_test_.gcode"
TEMP_LOG_FILE = "_test_.log"
###################################################################### ######################################################################
# Test cases # Test cases
@ -14,10 +17,11 @@ class error(Exception):
pass pass
class TestCase: class TestCase:
def __init__(self, fname, dictdir, tempdir): def __init__(self, fname, dictdir, tempdir, verbose):
self.fname = fname self.fname = fname
self.dictdir = dictdir self.dictdir = dictdir
self.tempdir = tempdir self.tempdir = tempdir
self.verbose = verbose
def relpath(self, fname, rel='test'): def relpath(self, fname, rel='test'):
if rel == 'dict': if rel == 'dict':
reldir = self.dictdir reldir = self.dictdir
@ -66,7 +70,7 @@ class TestCase:
should_fail): should_fail):
gcode_is_temp = False gcode_is_temp = False
if gcode_fname is None: if gcode_fname is None:
gcode_fname = self.relpath("_test_.gcode", 'temp') gcode_fname = self.relpath(TEMP_GCODE_FILE, 'temp')
gcode_is_temp = True gcode_is_temp = True
f = open(gcode_fname, 'wb') f = open(gcode_fname, 'wb')
f.write('\n'.join(gcode + [''])) f.write('\n'.join(gcode + ['']))
@ -78,20 +82,27 @@ class TestCase:
if dict_fname is None: if dict_fname is None:
raise error("data dictionary file not specified") raise error("data dictionary file not specified")
# Call klippy # Call klippy
sys.stderr.write("\n Starting %s (%s)\n" % ( sys.stderr.write(" Starting %s (%s)\n" % (
self.fname, os.path.basename(config_fname))) self.fname, os.path.basename(config_fname)))
args = [sys.executable, './klippy/klippy.py', config_fname, args = [sys.executable, './klippy/klippy.py', config_fname,
'-i', gcode_fname, '-o', '/dev/null', '-v', '-i', gcode_fname, '-o', '/dev/null', '-v',
'-d', dict_fname '-d', dict_fname
] ]
if not self.verbose:
args += ['-l', TEMP_LOG_FILE]
res = subprocess.call(args) res = subprocess.call(args)
is_fail = (should_fail and not res) or (not should_fail and res)
if is_fail:
if not self.verbose:
self.show_log()
if should_fail: if should_fail:
if not res:
raise error("Test failed to raise an error") raise error("Test failed to raise an error")
else:
if res:
raise error("Error during test") raise error("Error during test")
# Do cleanup # Do cleanup
if not self.verbose:
os.unlink(TEMP_LOG_FILE)
else:
sys.stderr.write('\n')
if gcode_is_temp: if gcode_is_temp:
os.unlink(gcode_fname) os.unlink(gcode_fname)
def run(self): def run(self):
@ -103,6 +114,11 @@ class TestCase:
logging.exception("Unhandled exception during test run") logging.exception("Unhandled exception during test run")
return "internal error" return "internal error"
return "success" return "success"
def show_log(self):
f = open(TEMP_LOG_FILE, 'rb')
data = f.read()
f.close()
sys.stdout.write(data)
###################################################################### ######################################################################
@ -117,16 +133,16 @@ def main():
help="directory for dictionary files") help="directory for dictionary files")
opts.add_option("-t", "--tempdir", dest="tempdir", default=".", opts.add_option("-t", "--tempdir", dest="tempdir", default=".",
help="directory for temporary files") help="directory for temporary files")
opts.add_option("-v", action="store_true", dest="verbose",
help="show all output from tests")
options, args = opts.parse_args() options, args = opts.parse_args()
if len(args) < 1: if len(args) < 1:
opts.error("Incorrect number of arguments") opts.error("Incorrect number of arguments")
logging.basicConfig(level=logging.DEBUG) logging.basicConfig(level=logging.DEBUG)
dictdir = options.dictdir
tempdir = options.tempdir
# Run each test # Run each test
for fname in args: for fname in args:
tc = TestCase(fname, dictdir, tempdir) tc = TestCase(fname, options.dictdir, options.tempdir, options.verbose)
res = tc.run() res = tc.run()
if res != 'success': if res != 'success':
sys.stderr.write("\n\nTest case %s FAILED (%s)!\n\n" % (fname, res)) sys.stderr.write("\n\nTest case %s FAILED (%s)!\n\n" % (fname, res))