diff options
| author | Xusheng <xusheng@vector35.com> | 2020-10-19 12:06:35 +0800 |
|---|---|---|
| committer | xusheng <xusheng@vector35.com> | 2020-10-27 13:29:06 +0800 |
| commit | 49c0f7cf8bbcc2ee62d614d274d737762f404af6 (patch) | |
| tree | f2c7eca9059c51977313dcd510cbb4a9fe4f29c9 | |
| parent | 4320bc093167b464c703f9ed98fbe7dccdeae990 (diff) | |
remove the loop to delete temp files on Windows
| -rw-r--r-- | suite/testcommon.py | 38 |
1 files changed, 6 insertions, 32 deletions
diff --git a/suite/testcommon.py b/suite/testcommon.py index 1ac7a940..c602ecb5 100644 --- a/suite/testcommon.py +++ b/suite/testcommon.py @@ -1257,14 +1257,7 @@ class VerifyBuilder(Builder): assert([str(functions == bndb_functions and comments == bndb_comments)]) bv.file.close() del bv - for i in range(5): - try: - time.sleep(1) - os.unlink(temp_name) - break - except OSError: - print("Failed to remove file {}".format(temp_name)) - continue + os.unlink(temp_name) # test with overridden arch preference binja.Settings().set_string_list("files.universal.architecturePreference", ["arm64"]) @@ -1333,14 +1326,7 @@ class VerifyBuilder(Builder): assert([str(functions == bndb_functions and comments == bndb_comments)]) bv.file.close() del bv - for i in range(5): - try: - time.sleep(1) - os.unlink(temp_name) - break - except OSError: - print("Failed to remove file {}".format(temp_name)) - continue + os.unlink(temp_name) binja.Settings().set_string_list("files.universal.architecturePreference", ["x86_64", "arm64"]) bv = binja.BinaryViewType.get_view_of_file_with_options(file_name, options={'loader.imageBase': 0xfffffff0000}) @@ -1458,15 +1444,9 @@ class VerifyBuilder(Builder): found = True assert(found) - for i in range(5): - try: - time.sleep(1) - os.unlink(temp_name) - break - except OSError: - print("Failed to remove file {}".format(temp_name)) - continue + os.unlink(temp_name) return True + finally: self.delete_package("helloworld") @@ -1507,15 +1487,9 @@ class VerifyBuilder(Builder): assert(def_ins.get_possible_reg_values_after('r3') == value) - for i in range(5): - try: - time.sleep(1) - os.unlink(temp_name) - break - except OSError: - print("Failed to remove file {}".format(temp_name)) - continue + os.unlink(temp_name) return True + finally: self.delete_package("helloworld") |