From fadedf437d4b905dd31bb794a126512e2554d0b0 Mon Sep 17 00:00:00 2001 From: xwings Date: Fri, 14 Oct 2022 17:05:52 +0800 Subject: [PATCH] minor update for setup.py, mcu test and windows registry --- qiling/os/windows/registry.py | 4 ++-- setup.py | 12 +++++------- tests/test_mcu.py | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/qiling/os/windows/registry.py b/qiling/os/windows/registry.py index 5cd0a6a68..9cc3ac813 100644 --- a/qiling/os/windows/registry.py +++ b/qiling/os/windows/registry.py @@ -178,11 +178,11 @@ def __init__(self, ql: Qiling, hivedir: str): self.reghive = RegHive(hivedir) except FileNotFoundError: if not ql.code: - QlErrorFileNotFound("Windows registry hive not found") + raise QlErrorFileNotFound("Windows registry hive not found") except Exception: if not ql.code: - QlErrorFileNotFound("Windows registry hive format error") + raise QlErrorFileNotFound("Windows registry hive format error") try: self.regconf = RegConf(self.regdiff) diff --git a/setup.py b/setup.py index 90c952c32..349b19e34 100644 --- a/setup.py +++ b/setup.py @@ -19,6 +19,11 @@ "multiprocess>=0.70.12.2", "windows-curses>=2.1.0;platform_system=='Windows'", "pyyaml>=6.0", + "json2html", + "pdfkit", + "python-fx", + "questionary", + "termcolor", ] extras = { @@ -45,13 +50,6 @@ ], "RE": [ "r2libr>=5.7.4", - ], - "tui": [ - "json2html", - "pdfkit", - "python-fx", - "questionary", - "termcolor", ] } diff --git a/tests/test_mcu.py b/tests/test_mcu.py index 8fa7500e1..1d8dd76cb 100644 --- a/tests/test_mcu.py +++ b/tests/test_mcu.py @@ -434,7 +434,7 @@ def test_mcu_fastmode_stm32f429(self): ql.hw.usart3.send(b'hackme\naaaaaaaaaaaaaaaaaaaa\xa9\x05\n') ql.os.fast_mode = True - ql.run(timeout=400) + ql.run(timeout=90000) self.assertEqual(ql.hw.usart2.recv(), b'Nice Hack!\n') self.assertEqual(ql.hw.usart3.recv(), b'Welcome to the world of Hacking!\naaaaaaaaaaaaaaaaaaaa\xa9\x05\n')