microsoft
/
CNTK
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #60 from stonebig/patch-7 

python 3 compatibility fix
This commit is contained in:
Chris Basoglu 2016-02-02 14:10:58 -08:00
Родитель a472be621b dc1ed4628f
Коммит d8b0c70e02
1 изменённых файлов: 25 добавлений и 25 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

50
Tests/EndToEndTests/TestDriver.py
Просмотреть файл

@ -157,7 +157,7 @@ class Test:
try: try:
assert(type(predicate(flavor='foo', device='bar', os='foobar', build_sku='qux')) == bool) assert(type(predicate(flavor='foo', device='bar', os='foobar', build_sku='qux')) == bool)
except Exception as e: except Exception as e:
print "Can't parse tag predicate expression in {0} ({1}):\n{2}".format(pathToYmlFile, pythonExpr, e) print ("Can't parse tag predicate expression in {0} ({1}):\n{2}".format(pathToYmlFile, pythonExpr, e))
raise e raise e
# saving generated lambda into tags dictionary # saving generated lambda into tags dictionary
@ -208,7 +208,7 @@ class Test:
with open(baselineFile, "r") as f: with open(baselineFile, "r") as f:
baseline = f.read().split("\n") baseline = f.read().split("\n")
if args.verbose: if args.verbose:
print "Baseline:", baselineFile print ("Baseline:", baselineFile)
# Before running the test, pre-creating TestCaseRunResult object for each test case # Before running the test, pre-creating TestCaseRunResult object for each test case
# and compute filtered lines from baseline file. # and compute filtered lines from baseline file.
@ -252,7 +252,7 @@ class Test:
logFile = os.path.join(runDir, "output.txt") logFile = os.path.join(runDir, "output.txt")
allLines = [] allLines = []
if args.verbose: if args.verbose:
print self.fullName + ":>" + logFile print (self.fullName + ":>" + logFile)
with open(logFile, "w") as output: with open(logFile, "w") as output:
cmdLine = ["bash", "-c", self.testDir + "/run-test 2>&1"] cmdLine = ["bash", "-c", self.testDir + "/run-test 2>&1"]
process = subprocess.Popen(cmdLine, stdout=subprocess.PIPE) process = subprocess.Popen(cmdLine, stdout=subprocess.PIPE)
@ -266,10 +266,10 @@ class Test:
line=line[:len(line)-1] line=line[:len(line)-1]
if args.verbose: if args.verbose:
print self.fullName + ": " + line print (self.fullName + ": " + line)
if args.dry_run: if args.dry_run:
print line print (line)
continue continue
print >>output, line print >>output, line
@ -310,7 +310,7 @@ class Test:
if result.succeeded: if result.succeeded:
if args.verbose: if args.verbose:
print "Updating baseline file", baselineFile print ("Updating baseline file", baselineFile)
with open(baselineFile, "w") as f: with open(baselineFile, "w") as f:
f.write("\n".join(allLines)) f.write("\n".join(allLines))
@ -400,14 +400,14 @@ class TestCase:
"Output: {1}\n" "Output: {1}\n"
).format(expected, line) ).format(expected, line)
if verbose: if verbose:
print "[FAILED]: Testcase", self.name print ("[FAILED]: Testcase", self.name)
print "Baseline:", expected print ("Baseline:", expected)
# also show all failed patterns # also show all failed patterns
for p in failedPatterns: for p in failedPatterns:
msg = "Failed pattern: " + p.patternText msg = "Failed pattern: " + p.patternText
if verbose: if verbose:
print msg print (msg)
result.diagnostics+=msg+"\n" result.diagnostics+=msg+"\n"
# removing this line, since we already matched it (whether succesfully or not - doesn't matter) # removing this line, since we already matched it (whether succesfully or not - doesn't matter)
del result.expectedLines[0] del result.expectedLines[0]
@ -541,9 +541,9 @@ def listCommand(args):
testsByTag[tag] = sets.Set([test.fullName]) testsByTag[tag] = sets.Set([test.fullName])
for tag in sorted(testsByTag.keys()): for tag in sorted(testsByTag.keys()):
if tag=="*": if tag=="*":
print ' '.join(sorted(testsByTag[tag])) print (' '.join(sorted(testsByTag[tag])))
else: else:
print tag+":", ' '.join(sorted(testsByTag[tag])) print (tag+":", ' '.join(sorted(testsByTag[tag])))
# Runs given test(s) or all tests # Runs given test(s) or all tests
def runCommand(args): def runCommand(args):
@ -565,15 +565,15 @@ def runCommand(args):
os.environ["TEST_ROOT_DIR"] = os.path.dirname(os.path.realpath(sys.argv[0])) os.environ["TEST_ROOT_DIR"] = os.path.dirname(os.path.realpath(sys.argv[0]))
print "CNTK Test Driver is started" print ("CNTK Test Driver is started")
print "Running tests: ", " ".join([y.fullName for y in testsToRun]) print ("Running tests: ", " ".join([y.fullName for y in testsToRun]))
print "Build location: ", args.build_location print ("Build location: ", args.build_location)
print "Run location: ", args.run_dir print ("Run location: ", args.run_dir)
print "Flavors: ", " ".join(flavors) print ("Flavors: ", " ".join(flavors))
print "Devices: ", " ".join(devices) print ("Devices: ", " ".join(devices))
if (args.update_baseline): if (args.update_baseline):
print "*** Running in automatic baseline update mode ***" print ("*** Running in automatic baseline update mode ***")
print "" print ("")
if args.dry_run: if args.dry_run:
os.environ["DRY_RUN"] = "1" os.environ["DRY_RUN"] = "1"
succeededCount, totalCount = 0, 0 succeededCount, totalCount = 0, 0
@ -590,7 +590,7 @@ def runCommand(args):
# Printing the test which is about to run (without terminating the line) # Printing the test which is about to run (without terminating the line)
sys.stdout.write("Running test {0} ({1} {2}) - ".format(test.fullName, flavor, device)); sys.stdout.write("Running test {0} ({1} {2}) - ".format(test.fullName, flavor, device));
if args.dry_run: if args.dry_run:
print "[SKIPPED] (dry-run)" print ("[SKIPPED] (dry-run)")
# in verbose mode, terminate the line, since there will be a lot of output # in verbose mode, terminate the line, since there will be a lot of output
if args.verbose: if args.verbose:
sys.stdout.write("\n"); sys.stdout.write("\n");
@ -604,9 +604,9 @@ def runCommand(args):
if result.succeeded: if result.succeeded:
succeededCount = succeededCount + 1 succeededCount = succeededCount + 1
# in no-verbose mode this will be printed in the same line as 'Running test...' # in no-verbose mode this will be printed in the same line as 'Running test...'
print "[OK] {0:.2f} sec".format(result.duration) print ("[OK] {0:.2f} sec".format(result.duration))
else: else:
print "[FAILED] {0:.2f} sec".format(result.duration) print ("[FAILED] {0:.2f} sec".format(result.duration))
# Showing per-test-case results: # Showing per-test-case results:
for testCaseRunResult in result.testCaseRunResults: for testCaseRunResult in result.testCaseRunResults:
if testCaseRunResult.succeeded: if testCaseRunResult.succeeded:
@ -622,12 +622,12 @@ def runCommand(args):
# In non-verbose mode log wasn't piped to the stdout, showing log file path for conveniencce # In non-verbose mode log wasn't piped to the stdout, showing log file path for conveniencce
if not result.succeeded and not args.verbose and result.logFile: if not result.succeeded and not args.verbose and result.logFile:
print " See log file for details:", result.logFile print (" See log file for details:", result.logFile)
if args.update_baseline: if args.update_baseline:
print "{0}/{1} baselines updated, {2} failed".format(succeededCount, totalCount, totalCount - succeededCount) print ("{0}/{1} baselines updated, {2} failed".format(succeededCount, totalCount, totalCount - succeededCount))
else: else:
print "{0}/{1} tests passed, {2} failed".format(succeededCount, totalCount, totalCount - succeededCount) print ("{0}/{1} tests passed, {2} failed".format(succeededCount, totalCount, totalCount - succeededCount))
if succeededCount != totalCount: if succeededCount != totalCount:
sys.exit(10) sys.exit(10)