X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPython%2FTest%2FTest_Python_Local_SH.py;h=727ce1c6959c6a56d416cb8c14a4f139829e7d85;hb=b4e59846fd2eaf893548f182645e7162da4ad731;hp=3a1e7422afaa5fd55dd6bc5b25282811ce62d375;hpb=81d83ed5bb4d235c5688dcec0e9458015e760e26;p=tools%2Flibbatch.git

diff --git a/src/Python/Test/Test_Python_Local_SH.py b/src/Python/Test/Test_Python_Local_SH.py
index 3a1e742..727ce1c 100644
--- a/src/Python/Test/Test_Python_Local_SH.py
+++ b/src/Python/Test/Test_Python_Local_SH.py
@@ -1,23 +1,23 @@
-#  Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+# Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 #
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
 #
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
 #
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
 import config
@@ -29,10 +29,10 @@ import time
 from libbatch import *
 
 def work():
-    print "*******************************************************************************************"
-    print "This script tests the local batch submission based on SH. No specific configuration is"
-    print "needed for this test."
-    print "*******************************************************************************************"
+    print("*******************************************************************************************")
+    print("This script tests the local batch submission based on SH. No specific configuration is")
+    print("needed for this test.")
+    print("*******************************************************************************************")
 
     # eventually remove any previous result
     if (os.path.exists("resultdir/seconddirname/result.txt")):
@@ -54,7 +54,7 @@ def work():
     e = {}
     e["MYENVVAR"] = "MYVALUE";
     job.setEnvironnement(e)
-    print job
+    print(job)
 
     # Get the catalog
     c = BatchManagerCatalog.getInstance()
@@ -64,7 +64,7 @@ def work():
 
     # Submit the job to the BatchManager
     jobid = bm.submitJob(job)
-    print jobid
+    print(jobid)
 
     # Query the job
     jobid.queryJob()
@@ -74,28 +74,28 @@ def work():
 
 
     if state == FINISHED:
-        print "Job", jobid, "is done"
+        print("Job", jobid, "is done")
         bm.importOutputFiles(job, "resultdir/seconddirname")
     elif state == FAILED:
-        print "Job", jobid, " finished in error"
+        print("Job", jobid, " finished in error")
         bm.importOutputFiles(job, "resultdir/seconddirname")
         return 1
     else:
-        print "Timeout while executing job"
+        print("Timeout while executing job")
         return 1
 
     if state != FINISHED and state != FAILED:
-        print "Error: Job not finished after timeout"
+        print("Error: Job not finished after timeout")
         return 1;
 
     # test the result file
     res = {}
-    execfile('resultdir/seconddirname/result.txt', res)
+    exec(compile(open('resultdir/seconddirname/result.txt').read(), 'resultdir/seconddirname/result.txt', 'exec'), res)
     if (res["c"] == 12 and res["MYENVVAR"] == "MYVALUE"):
-      print "OK, Expected result found."
+      print("OK, Expected result found.")
       return 0
     else:
-      print "result found : %s, expected : %s" % (res, 'res["c"] == 12 and res["MYENVVAR"] == "MYVALUE"')
+      print("result found : %s, expected : %s" % (res, 'res["c"] == 12 and res["MYENVVAR"] == "MYVALUE"'))
       return 1
 
 if __name__ == "__main__":