Updates from testing

Author: TimSVector

generate_pclp_reports.py

@@ -280,7 +280,7 @@ def generate_source():
         if os.path.isfile(fname + ".vcast.bak"):
             fname = fname + ".vcast.bak"
 
-        with open(fname, 'rb') as fh:
+        with open(fname, "rb") as fh:
             # read and replace the line ending for consistency
             contents = fh.read().encode(encFmnt, "replace")
             contents = contents.replace("\r\n", "\n").replace("\r","\n")
@@ -487,7 +487,7 @@ def emit_gitlab(msgs):
 # Driver
 
 def write_output(output, filename):
-    with open(filename, 'wb') as file:
+    with open(filename, "wb") as file:
         file.write(output.encode(encFmt, "replace"))
 
 def generate_reports(input_xml, output_text = None, output_html = None, output_json = None, output_gitlab = None, full_mp_name = None):

generate_results.py

@@ -48,6 +48,10 @@
     pass
 from vector.enums import ENVIRONMENT_STATUS_TYPE_T
 
+from vcast_utils import dump, getVectorCASTEncoding
+
+encFmt = getVectorCASTEncoding()
+
 #global variables
 global verbose
 global print_exc
@@ -114,14 +118,39 @@ def readManageVersion(ManageFile):
     version = 14
     if os.path.isfile(ManageFile + ".vcm"):
         ManageFile = ManageFile + '.vcm'
-    with open(ManageFile, 'r') as projFile:
-        for line in projFile:
-            if 'version' in line and 'project' in line:
-                version = int(re.findall(r'\d+', line)[0])
-                break
+        
+    py2 = sys.version_info[0] < 3
+
+    with open(ManageFile, "rb") as projFile:
+        for raw_line in projFile:
+            # --- Normalize line to text (unicode in Py3, unicode or str in Py2) ---
+            if py2:
+                # In Py2, raw_line is a str (byte string)
+                try:
+                    line = raw_line.decode(encFmt, "replace")
+                except Exception:
+                    line = raw_line.decode("utf-8", "replace")
+            else:
+                # In Py3, raw_line is bytes
+                if isinstance(raw_line, bytes):
+                    try:
+                        line = raw_line.decode(encFmt, "replace")
+                    except Exception:
+                        line = raw_line.decode("utf-8", "replace")
+                else:
+                    line = raw_line
+
+            # --- Look for version/project keywords ---
+            if "version" in line and "project" in line:
+                match = re.search(r"\d+", line)
+                if match:
+                    version = int(match.group())
+                    break
+        
     if verbose:
         print("Version of Manage project file = %d" % version)
         print("(Levels change in version 17 (*maybe) and above)")
+        
     return version
 
 # Call manage to get the mapping of Envs to Directory etc.
@@ -324,9 +353,8 @@ def useNewAPI(FullManageProjectName, manageEnvs, level, envName, use_ci, xml_dat
                 passed_count += pc
                 generateIndividualReports(manageEnvs[currentEnv], envName)
 
-    f = open("unit_test_fail_count.txt","w")
-    f.write(str(failed_count))
-    f.close()
+    with open("unit_test_fail_count.txt","wb") as fd:
+        f.write(str(failed_count).encode(encFmt,'replace'))
 
     return failed_count, passed_count
 

generate_xml.py

@@ -502,6 +502,7 @@ def __init__(self, FullManageProjectName, build_dir, env, compiler, testsuite, c
         self.passed_count = 0
         self.useStartLine = False
         self.noResults = False
+        self.report_failed_only = False
 
         if os.path.exists(cov_path) and os.path.exists(cov_path[:-4]):
             self.using_cover = True
@@ -650,7 +651,7 @@ def start_system_test_file(self):
         if self.verbose:
             print("  Writing testcase xml file:        {}".format(self.unit_report_name))
 
-        self.fh = open(self.unit_report_name, "w")
+        self.fh = open(self.unit_report_name, "wb")
         errors = 0
         failed = 0
         success = 0                                            
@@ -670,7 +671,7 @@ def start_system_test_file(self):
                         self.failed_count += 1
         api.close()            
 
-        data =  "<?xml version=\"1.0\" encoding=\{}\"?>\n".format(self.encFtm)         
+        data =  "<?xml version=\"1.0\" encoding=\{}\"?>\n".format(self.encFmt)         
         data += "<testsuites>\n"
         data += "    <testsuite errors=\"{}\" tests=\"{}\" failures=\"{}\" name=\"{}\" id=\"1\">\n".format(errors, success+failed+errors, failed, escape(self.env, quote=False))
 
@@ -680,7 +681,7 @@ def start_unit_test_file(self):
         if self.verbose:
             print("  Writing testcase xml file:        {}".format(self.unit_report_name))
 
-        self.fh = open(self.unit_report_name, "w")
+        self.fh = open(self.unit_report_name, "wb")
         errors = 0
         failed = 0
         success = 0