use print() - import print_function - should be fine for both py2 and py3

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

diff --git a/test/lib/test_utils.py b/test/lib/test_utils.py
index ed9be12..c6a08d3 100644 (file)
--- 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 <alina.quereilhac@inria.fr>
 
+from __future__ import print_function
+
 from nepi.resources.linux.node import LinuxNode
 
 import os
@@ -61,8 +62,8 @@ def skipIfNotAlive(func):
             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"))
+                print("*** WARNING: Skipping test %s: Node %s is not alive\n" % (
+                    name, node.get("hostname")))
                 return
 
         return func(*args, **kwargs)
@@ -81,8 +82,8 @@ def skipIfAnyNotAlive(func):
             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)
@@ -102,8 +103,8 @@ def skipIfAnyNotAliveWithIdentity(func):
             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"))
+                print("*** WARNING: Skipping test %s: Node %s is not alive\n" % (
+                    name, node.get("hostname")))
                 return
 
         return func(*args, **kwargs)
@@ -117,7 +118,7 @@ def skipInteractive(func):
         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)
@@ -130,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)
@@ -141,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)
@@ -155,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)
@@ -169,7 +170,7 @@ 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)