Merge pull request #1246 from xwings/dev

minor update for setup.py, mcu test and windows registry

qiling/os/windows/registry.py

@@ -178,11 +178,11 @@ class RegistryManager:
             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)

setup.py

@@ -19,6 +19,11 @@ requirements = [
     "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 @@ extras = {
     ],
     "RE": [
        "r2libr>=5.7.4",
-    ],
-    "tui": [
-        "json2html",
-        "pdfkit",
-        "python-fx",
-        "questionary",
-        "termcolor",
     ]
 }
 

tests/test_mcu.py

@@ -434,7 +434,7 @@ class MCUTest(unittest.TestCase):
         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')