Merge pull request #693 from gpotter2/fix-tests-1

[tests] Remove stuck test

scapy/arch/windows/__init__.py

@@ -246,7 +246,7 @@ class WinProgPath(ConfClass):
                                env="SystemRoot")
         if self.wireshark:
             manu_path = load_manuf(os.path.sep.join(self.wireshark.split(os.path.sep)[:-1])+os.path.sep+"manuf")
-            scapy.data.MANUFDB = conf.manufdb = MANUFDB = manu_path
+            scapy.data.MANUFDB = conf.manufdb = manu_path
         
         self.os_access = (self.powershell is not None) or (self.cscript is not None)
 

test/linux.uts

@@ -54,12 +54,15 @@ assert(os.system(IPTABLE_RULE % ('D', SECDEV_IP4)) == 0)
 
 assert(success)
 
-= Supersocket _flush_fd
-~ needs_root linux
-
-import select
-
-from scapy.arch.linux import _flush_fd
-socket = conf.L2listen()
-select.select([socket],[],[],2)
-_flush_fd(socket.ins)
+# TODO: fix this test (randomly stuck)
+# ex: https://travis-ci.org/secdev/scapy/jobs/247473497
+
+#= Supersocket _flush_fd
+#~ needs_root linux
+#
+#import select
+#
+#from scapy.arch.linux import _flush_fd
+#socket = conf.L2listen()
+#select.select([socket],[],[],2)
+#_flush_fd(socket.ins)

test/regression.uts

@@ -331,8 +331,8 @@ if not WINDOWS:
 
 = Test manuf DB methods
 ~ manufdb
-assert(MANUFDB._resolve_MAC("00:00:0F:01:02:03") == "Next:01:02:03")
-assert(MANUFDB._get_short_manuf("00:00:0F:01:02:03") == "Next")
+assert(conf.manufdb._resolve_MAC("00:00:0F:01:02:03") == "Next:01:02:03")
+assert(conf.manufdb._get_short_manuf("00:00:0F:01:02:03") == "Next")
 assert(in6_addrtovendor("fe80::0200:0fff:fe01:0203").lower().startswith("next"))
 
 = Test utility functions - network related