Merge pull request #7485 from fstagni/90_addARMtest

[9.0] add ARM mtest

src/DIRAC/Resources/Computing/SSHBatchComputingElement.py

@@ -2,11 +2,10 @@
     directly through ssh
 """
 import os
-import socket
 import stat
 from urllib.parse import urlparse
 
-from DIRAC import S_ERROR, S_OK, rootPath
+from DIRAC import S_ERROR, S_OK
 from DIRAC.Resources.Computing.PilotBundle import bundleProxy, writeScript
 from DIRAC.Resources.Computing.SSHComputingElement import SSHComputingElement
 from DIRAC.WorkloadManagementSystem.Client import PilotStatus

src/DIRAC/Resources/Computing/SSHComputingElement.py

@@ -68,22 +68,17 @@
 import shutil
 import stat
 import uuid
-from urllib.parse import urlparse
-from urllib.parse import quote
-from urllib.parse import unquote
 from shlex import quote as shlex_quote
+from urllib.parse import quote, unquote, urlparse
 
 import pexpect
 
 import DIRAC
-from DIRAC import S_OK, S_ERROR
-from DIRAC import gLogger
-
+from DIRAC import S_ERROR, S_OK, gLogger
+from DIRAC.Core.Utilities.List import breakListIntoChunks, uniqueElements
+from DIRAC.Resources.Computing.BatchSystems.executeBatch import executeBatchContent
 from DIRAC.Resources.Computing.ComputingElement import ComputingElement
 from DIRAC.Resources.Computing.PilotBundle import bundleProxy, writeScript
-from DIRAC.Resources.Computing.BatchSystems.executeBatch import executeBatchContent
-from DIRAC.Core.Utilities.List import uniqueElements
-from DIRAC.Core.Utilities.List import breakListIntoChunks
 
 
 class SSH:

src/DIRAC/Resources/Computing/SingularityComputingElement.py

@@ -11,7 +11,6 @@
     See the Configuration/Resources/Computing documention for details on
     where to set the option parameters.
 """
-import io
 import json
 import os
 import re
@@ -20,9 +19,9 @@
 import tempfile
 
 import DIRAC
-from DIRAC import S_OK, S_ERROR, gConfig, gLogger
-from DIRAC.Core.Utilities.Subprocess import systemCall
+from DIRAC import S_ERROR, S_OK, gConfig, gLogger
 from DIRAC.ConfigurationSystem.Client.Helpers import Operations
+from DIRAC.Core.Utilities.Subprocess import systemCall
 from DIRAC.Core.Utilities.ThreadScheduler import gThreadScheduler
 from DIRAC.Resources.Computing.ComputingElement import ComputingElement
 from DIRAC.Resources.Storage.StorageElement import StorageElement

src/DIRAC/tests/Utilities/testJobDefinitions.py

@@ -209,6 +209,22 @@ def helloWorldSSHBatch():
     return endOfAllJobs(J)
 
 
+def helloWorldARM():
+    """simple hello world job to DIRAC.ARM.ch"""
+
+    J = baseToAllJobs("helloWorldARM")
+    try:
+        J.setInputSandbox([find_all("exe-script.py", rootPath, "DIRAC/tests/Workflow")[0]])
+    except IndexError:
+        try:
+            J.setInputSandbox([find_all("exe-script.py", ".", "DIRAC/tests/Workflow")[0]])
+        except IndexError:  # we are in Jenkins
+            J.setInputSandbox([find_all("exe-script.py", os.environ["WORKSPACE"], "DIRAC/tests/Workflow")[0]])
+    J.setExecutable("exe-script.py", "", "helloWorld.log")
+    J.setDestination("DIRAC.ARM.ch")
+    return endOfAllJobs(J)
+
+
 def helloWorldCloudCE():
     """simple hello world job to Cloud at Imperial College using SiteDirector"""
 

tests/System/unitTestUserJobs.py

@@ -69,6 +69,10 @@ def test_submit(self):
         self.assertTrue(res["OK"])
         jobsSubmittedList.append(res["Value"])
 
+        res = helloWorldARM()
+        self.assertTrue(res["OK"])
+        jobsSubmittedList.append(res["Value"])
+
         res = mpJob()
         self.assertTrue(res["OK"])
         jobsSubmittedList.append(res["Value"])