X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Flib%2Ftest_utils.py;h=c6a08d3950deb83b0a204444d22ac5ee50d75e2e;hb=039fbd9629d7570d4c175a5448d24badcd0f3aba;hp=7fcb98076aa0136457e18b79dc0fbcaa6e6b7e84;hpb=e0972478442dbd4dbdd9b801d3f67933c9438623;p=nepi.git diff --git a/test/lib/test_utils.py b/test/lib/test_utils.py index 7fcb9807..c6a08d39 100644 --- a/test/lib/test_utils.py +++ b/test/lib/test_utils.py @@ -3,9 +3,8 @@ # Copyright (C) 2013 INRIA # # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation; # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -17,6 +16,8 @@ # # Author: Alina Quereilhac +from __future__ import print_function + from nepi.resources.linux.node import LinuxNode import os @@ -27,11 +28,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 +48,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,27 +75,50 @@ 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] node, ec = create_node(hostname, username) if not node.is_alive(): - print "*** WARNING: Skipping test %s: Node %s is not alive\n" % ( - name, node.get("hostname")) + print("*** WARNING: Skipping test %s: Node %s is not alive\n" % ( + name, node.get("hostname"))) return return func(*args, **kwargs) 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): mode = os.environ.get("NEPI_INTERACTIVE_TEST", False) mode = mode and mode.lower() in ['true', 'yes'] if not mode: - print "*** WARNING: Skipping test %s: Interactive mode off \n" % name + print("*** WARNING: Skipping test %s: Interactive mode off \n" % name) return return func(*args, **kwargs) @@ -90,7 +131,7 @@ def skipIfNotPLCredentials(func): pl_user = os.environ.get("PL_USER") pl_pass = os.environ.get("PL_PASS") if not (pl_user and pl_pass): - print "*** WARNING: Skipping test %s: Planetlab user, password and slicename not defined\n" % name + print("*** WARNING: Skipping test %s: Planetlab user, password and slicename not defined\n" % name) return return func(*args, **kwargs) @@ -101,7 +142,7 @@ def skipIfNotPythonVersion(func): name = func.__name__ def wrapped(*args, **kwargs): if sys.version_info < 2.7: - print "*** WARNING: Skipping test %s: total_seconds() method doesn't exist\n" % name + print("*** WARNING: Skipping test %s: total_seconds() method doesn't exist\n" % name) return return func(*args, **kwargs) @@ -115,7 +156,7 @@ def skipIfNotSfaCredentials(func): sfa_pk = os.environ.get("SFA_PK") if not (sfa_user and os.path.exists(os.path.expanduser(sfa_pk))): - print "*** WARNING: Skipping test %s: SFA path to private key doesn't exist\n" % name + print("*** WARNING: Skipping test %s: SFA path to private key doesn't exist\n" % name) return return func(*args, **kwargs) @@ -129,9 +170,24 @@ def skipIfNotSfi(func): from sfa.client.sfi import Sfi from sfa.util.xrn import hrn_to_urn except ImportError: - print "*** WARNING: Skipping test %s: sfi-client or sfi-common not installed\n" % name + print("*** WARNING: Skipping test %s: sfi-client or sfi-common not installed\n" % name) return 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 + + +