Fixing UdpTunnel unit tests for PlanetLab

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

diff --git a/test/lib/test_utils.py b/test/lib/test_utils.py
index 7fcb980..ed9be12 100644 (file)
--- a/test/lib/test_utils.py
+++ b/test/lib/test_utils.py
@@ -27,11 +27,17 @@ class DummyEC(object):
     def exp_id(self):
         return "nepi-1"
 
-def create_node(hostname, username):
+def create_node(hostname, username = None, identity = None):
     ec = DummyEC()
     node = LinuxNode(ec, 1)
+
     node.set("hostname", hostname)
-    node.set("username", username)
+    
+    if username:
+        node.set("username", username)
+    
+    if identity:
+        node.set("identity", identity)
 
     # If we don't return the reference to the EC
     # it will be released by the garbage collector since 
@@ -41,12 +47,23 @@ def create_node(hostname, username):
 def skipIfNotAlive(func):
     name = func.__name__
     def wrapped(*args, **kwargs):
-        node, ec = create_node(args[1], args[2])
+        hostname = args[1]
+        if hostname != "localhost":
+            username = None
+            identity = None
 
-        if not node.is_alive():
-            print "*** WARNING: Skipping test %s: Node %s is not alive\n" % (
-                name, node.get("hostname"))
-            return
+            if len(args) >= 3:
+                username = args[2]
+
+            if len(args) >= 4:
+                identity = args[3]
+
+            node, ec = create_node(hostname, username, identity)
+
+            if not node.is_alive():
+                print "*** WARNING: Skipping test %s: Node %s is not alive\n" % (
+                    name, node.get("hostname"))
+                return
 
         return func(*args, **kwargs)
     
@@ -57,6 +74,7 @@ def skipIfAnyNotAlive(func):
     def wrapped(*args, **kwargs):
         argss = list(args)
         argss.pop(0)
+
         for i in xrange(len(argss)/2):
             username = argss[i*2]
             hostname = argss[i*2+1]
@@ -71,6 +89,28 @@ def skipIfAnyNotAlive(func):
     
     return wrapped
 
+def skipIfAnyNotAliveWithIdentity(func):
+    name = func.__name__
+    def wrapped(*args, **kwargs):
+        argss = list(args)
+        argss.pop(0)
+        for i in xrange(len(argss)/3):
+            username = argss[i*3]
+            hostname = argss[i*3+1]
+            identity = argss[i*3+2]
+
+            node, ec = create_node(hostname, username, identity)
+
+            if not node.is_alive():
+                print "*** WARNING: Skipping test %s: Node %s is not alive\n" % (
+                    name, node.get("hostname"))
+                return
+
+        return func(*args, **kwargs)
+    
+    return wrapped
+
+
 def skipInteractive(func):
     name = func.__name__
     def wrapped(*args, **kwargs):
@@ -135,3 +175,18 @@ def skipIfNotSfi(func):
         return func(*args, **kwargs)
 
     return wrapped
+
+def skipIf(cond, text):
+    def wrapped(func, text):
+        name = func.__name__
+
+        def banner(*args, **kwargs):
+            sys.stderr.write("*** WARNING: Skipping test %s: `%s'\n" %
+                    (name, text))
+            return None
+        return banner
+
+    return (lambda func: wrapped(func, text)) if cond else lambda func: func
+
+
+