Fix tests

Author: svpcom

wfb_ng/tests/test_tuntap.py

@@ -3,10 +3,12 @@
 
 import os
 import time
+from twisted import version as twisted_version
 from twisted.python import log
 from twisted.trial import unittest
 from twisted.internet import reactor, defer
 from twisted.internet.utils import getProcessOutputAndValue
+from incremental import Version
 from ..tuntap import TUNTAPTransport, TUNTAPProtocol
 from ..common import df_sleep
 
@@ -20,11 +22,13 @@
 """
 
 docker_arch = os.environ.get('DOCKER_ARCH')
-bad_qemu_arch = ("mips64le.mips64le.MIPS64R2-generic", "s390x.s390x.max", "ppc64le.ppc64le.power8")
+bad_qemu_arch = ("mips64le", "s390x", "ppc64le")
 
 class TUNTAPTestCase(unittest.TestCase):
-    if os.geteuid() != 0 or not os.path.exists('/dev/net/tun') or docker_arch in bad_qemu_arch:
-        skip = "Root permission is required to test tunnel"
+    if os.geteuid() != 0 or not os.path.exists('/dev/net/tun') \
+       or docker_arch in bad_qemu_arch \
+       or twisted_version < Version("Twisted", 19, 7, 0):
+        skip = "Root requires or system is incompatible"
 
     def setUp(self):
         self.p1 = TUNTAPProtocol(mtu=1400)