Fixed TestDriver.py output format regressions introduced in dc1ed46

Tests/EndToEndTests/TestDriver.py

@@ -208,7 +208,7 @@ def runImpl(self, flavor, device, args):
       with open(baselineFile, "r") as f:
         baseline = f.read().split("\n")
         if args.verbose:
-           print ("Baseline:", baselineFile)
+           print ("Baseline: " + baselineFile)
 
     # Before running the test, pre-creating TestCaseRunResult object for each test case
     # and compute filtered lines from baseline file.
@@ -310,7 +310,7 @@ def runImpl(self, flavor, device, args):
 
       if result.succeeded:
        if args.verbose:
-         print ("Updating baseline file", baselineFile)
+         print ("Updating baseline file " + baselineFile)
        with open(baselineFile, "w") as f:
          f.write("\n".join(allLines))
 
@@ -400,8 +400,8 @@ def processLine(self, line, result, verbose):
                                "Output:   {1}\n"
                               ).format(expected, line)
           if verbose:
-            print ("[FAILED]: Testcase", self.name)
-            print ("Baseline:", expected)
+            print ("[FAILED]: Testcase " + self.name)
+            print ("Baseline: " + expected)
 
           # also show all failed patterns
           for p in failedPatterns:
@@ -543,7 +543,7 @@ def listCommand(args):
     if tag=="*":
       print (' '.join(sorted(testsByTag[tag])))
     else:
-      print (tag+":", ' '.join(sorted(testsByTag[tag])))
+      print (tag + ": " + ' '.join(sorted(testsByTag[tag])))
 
 # Runs given test(s) or all tests
 def runCommand(args):
@@ -566,11 +566,11 @@ def runCommand(args):
   os.environ["TEST_ROOT_DIR"] = os.path.dirname(os.path.realpath(sys.argv[0]))
 
   print ("CNTK Test Driver is started")
-  print ("Running tests:  ", " ".join([y.fullName for y in testsToRun]))
-  print ("Build location: ", args.build_location)
-  print ("Run location:   ", args.run_dir)
-  print ("Flavors:        ", " ".join(flavors))
-  print ("Devices:        ", " ".join(devices))
+  print ("Running tests:  " + " ".join([y.fullName for y in testsToRun]))
+  print ("Build location: " + args.build_location)
+  print ("Run location:   " + args.run_dir)
+  print ("Flavors:        " + " ".join(flavors))
+  print ("Devices:        " + " ".join(devices))
   if (args.update_baseline):
     print ("*** Running in automatic baseline update mode ***")
   print ("")
@@ -622,7 +622,7 @@ def runCommand(args):
               # 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:
-            print ("  See log file for details:", result.logFile)
+            print ("  See log file for details: " + result.logFile)
 
   if args.update_baseline:
     print ("{0}/{1} baselines updated, {2} failed".format(succeededCount, totalCount, totalCount - succeededCount))