fix(runtest.py): Improve error handling in Runner class and cleanup process

Author: lum1n0us

tests/wamr-test-suites/spec-test-script/runtest.py

@@ -181,7 +181,16 @@ def _read_stdout_byte(self) -> Tuple[bool, Optional[bytes]]:
             # queue, so we keep it for non-windows platforms.
             [outs,_,_] = select([self.stdout], [], [], 1)
             if self.stdout in outs:
-                return True, self.stdout.read(1)
+                try:
+                    stdout_byte = self.stdout.read(1)
+                except ValueError:
+                    return True, None
+                except OSError:
+                    return True, None
+                except Exception as e:
+                    print("Exception: ", e)
+                    return False, None
+                return True, stdout_byte
             else:
                 return False, None
 
@@ -1302,6 +1311,20 @@ def test_assert_with_exception(form, wast_tempfile, wasm_tempfile, aot_tempfile,
                 raise Exception("Failed:\n  expected: '%s'\n  got: '%s'" % \
                                 (expected, r.buf))
 
+def recently_added_wasm(temp_file_repo):
+    for f in reversed(temp_file_repo):
+        if not f:
+            continue
+
+        assert os.path.exists(f), f"temp file {f} should exist"
+        
+        if os.path.getsize(f) == 0:
+            continue
+
+        if f.endswith(".wasm"):
+            return f
+
+
 if __name__ == "__main__":
     opts = parser.parse_args(sys.argv[1:])
     # print('Input param :',opts)
@@ -1501,10 +1524,12 @@ def test_assert_with_exception(form, wast_tempfile, wasm_tempfile, aot_tempfile,
                 # assumption
                 # - There exists a module in the form of (module $name).
                 # - The nearest module in the form of (module), without $name, is the candidate for registration.
+                recently_wasm = recently_added_wasm(temp_file_repo)
                 if not name_new in temp_module_table:
-                    print(f"Module {name_new} is not found in temp_module_table. use the nearest module {wasm_tempfile}")
+                    print(temp_file_repo)
+                    print(f"Module {name_new} is not found in temp_module_table. use the nearest module {recently_wasm}")
 
-                for_registration = temp_module_table.get(name_new, wasm_tempfile)
+                for_registration = temp_module_table.get(name_new, recently_wasm)
                 assert os.path.exists(for_registration), f"module {for_registration} is not found"
 
                 new_module = os.path.join(tempfile.gettempdir(), name_new + ".wasm")
@@ -1547,25 +1572,25 @@ def test_assert_with_exception(form, wast_tempfile, wasm_tempfile, aot_tempfile,
     else:
         ret_code = 0
     finally:
-        if not opts.no_cleanup:
-            log(f"Removing tempfiles {wast_tempfile} and {wasm_tempfile}")
-            try:
+        try:
+            if not opts.no_cleanup:
                 # remove the files under /tempfiles/ and copy of .wasm files
+                log(f"Removing {temp_file_repo}")
+
                 for t in temp_file_repo:
                     # None and empty
                     if not t:
                         continue
 
                     if os.path.exists(t):
-                        log(f"Removing {t}")
                         os.remove(t)
-
-            except Exception as e:
-                print("Failed to remove tempfiles: %s" % e)
-                # ignore the exception
-                ret_code = 0
-        else:
-            log("Leaving tempfiles: %s" % ([wast_tempfile, wasm_tempfile]))
+            else:
+                log(f"Leaving {temp_file_repo}")
+            
+        except Exception as e:
+            print("Failed to remove tempfiles: %s" % e)
+            # ignore the exception
+            ret_code = 0
 
         log(f"### End testing {opts.test_file.name} with {ret_code}")
         sys.exit(ret_code)