Skip tests properly

Author: elicn

tests/test_android.py

@@ -11,10 +11,8 @@
 
 
 class TestAndroid(unittest.TestCase):
+    @unittest.skipUnless(platform.system() == 'Linux', 'run only on Linux')
     def test_android_arm64(self):
-        if platform.system() != "Linux":
-            return
-
         test_binary = "../examples/rootfs/arm64_android/bin/arm64_android_hello"
         rootfs = "../examples/rootfs/arm64_android"
 

tests/test_elf_ko.py

@@ -17,10 +17,8 @@
 
 class ELF_KO_Test(unittest.TestCase):
 
+    @unittest.skipIf(IS_FAST_TEST, 'fast test')
     def test_demigod_m0hamed_x86(self):
-        if IS_FAST_TEST:
-            self.skipTest('QL_FAST_TEST')
-
         checklist = {}
 
         @linux_kernel_api(params={

tests/test_elf_multithread.py

@@ -13,10 +13,8 @@
 
 class ELFTest(unittest.TestCase):
 
+    @unittest.skipIf(platform.system() == "Darwin" and platform.machine() == "arm64", 'darwin host')
     def test_elf_linux_execve_x8664(self):
-        if platform.system() == "Darwin" and platform.machine() == "arm64":
-            return
-        
         ql = Qiling(["../examples/rootfs/x8664_linux/bin/posix_syscall_execve"],  "../examples/rootfs/x8664_linux", verbose=QL_VERBOSE.DEBUG)   
         ql.run()
 

tests/test_macho_kext.py

@@ -4,7 +4,7 @@
 #
 
 
-import sys, unittest
+import os, sys, unittest
 from pathlib import Path
 
 from unicorn import UcError
@@ -16,7 +16,10 @@
 from qiling.os.macos.structs import *
 from qiling.os.macos.fncc import macos_kernel_api
 
+IS_FAST_TEST = 'QL_FAST_TEST' in os.environ
+
 class MACHOTest(unittest.TestCase):
+    @unittest.skipIf(IS_FAST_TEST, 'fast test')
     def test_macho_macos_superrootkit(self):
         # https://developer.apple.com/download/more
         # to download kernel.developmment

tests/test_pe.py

@@ -110,6 +110,7 @@ def _t():
         self.assertTrue(QLWinSingleTest(_t).run())
 
 
+    @unittest.skipIf(IS_FAST_TEST, 'fast test')
     def test_pe_win_x86_uselessdisk(self):
         def _t():
             class Fake_Drive(QlFsMappedObject):
@@ -134,12 +135,10 @@ def close(self):
             del ql
             return True
 
-        if IS_FAST_TEST:
-            self.skipTest('QL_FAST_TEST')
-
         self.assertTrue(QLWinSingleTest(_t).run())
 
 
+    @unittest.skipIf(IS_FAST_TEST, 'fast test')
     def test_pe_win_x86_gandcrab(self):
         def _t():
             def stop(ql: Qiling):
@@ -215,9 +214,6 @@ def __rand_name(minlen: int, maxlen: int) -> str:
             # let's check that gandcrab behave takes a different path if a different environment is found
             return num_syscalls_admin != num_syscalls_user
 
-        if IS_FAST_TEST:
-            self.skipTest('QL_FAST_TEST')
-
         self.assertTrue(QLWinSingleTest(_t).run())
 
     def test_pe_win_x86_multithread(self):
@@ -331,6 +327,7 @@ def _t():
         self.assertTrue(QLWinSingleTest(_t).run())
 
 
+    @unittest.skipIf(IS_FAST_TEST, 'fast test')
     def test_pe_win_x86_wannacry(self):
         def _t():
             def stop(ql):
@@ -345,9 +342,6 @@ def stop(ql):
             del ql
             return True
 
-        if IS_FAST_TEST:
-            self.skipTest('QL_FAST_TEST')
-
         self.assertTrue(QLWinSingleTest(_t).run())
 
 
@@ -363,6 +357,7 @@ def _t():
         self.assertTrue(QLWinSingleTest(_t).run())
 
 
+    @unittest.skipIf(IS_FAST_TEST, 'fast test')
     def test_pe_win_al_khaser(self):
         def _t():
             ql = Qiling(["../examples/rootfs/x86_windows/bin/al-khaser.bin"], "../examples/rootfs/x86_windows")
@@ -392,9 +387,6 @@ def end(ql):
             del ql
             return True
 
-        if IS_FAST_TEST:
-            self.skipTest('QL_FAST_TEST')
-
         self.assertTrue(QLWinSingleTest(_t).run())