ns-3.11

[nepi.git] / test / lib / test_util.py

diff --git a/test/lib/test_util.py b/test/lib/test_util.py
index 87e22c3..3373b8e 100644 (file)
--- a/test/lib/test_util.py
+++ b/test/lib/test_util.py
@@ -31,24 +31,14 @@ def ns3_library_path():
     return None
 
 def ns3_usable():
-    if ns3_library_path():
-        try:
-            ctypes.CDLL(ns3_library_path(), ctypes.RTLD_GLOBAL)
-        except:
-            return False
-
-    if ns3_bindings_path():
-        sys.path.insert(0, ns3_bindings_path())
-
     try:
-        found = imp.find_module('ns3')
-        module = imp.load_module('ns3', *found)
-    except ImportError:
+        from nepi.testbeds.ns3 import execute
+        execute.load_ns3_module()
+    except:
+        import traceback
+        import sys
+        traceback.print_exc(file = sys.stderr)
         return False
-    finally:
-        if ns3_bindings_path():
-            del sys.path[0]
-
     return True
 
 def pl_auth():