sweep: #6547 test: fix: use dirac-admin-get-proxy

Author: fstagni

pytest.ini

@@ -6,3 +6,5 @@ python_files=Test_*.py assert*.py
 # in order to make sure that M2Crypto and pyGSI do not step
 # on each other's feet
 addopts = --no-cov -rx -v --color=yes --showlocals --tb=long --ignore=tests
+markers =
+    slow: marks tests as slow (deselect with '-m "not slow"')

src/DIRAC/Core/Base/Script.py

@@ -38,8 +38,7 @@ def __call__(self, func=None):
         """Set the wrapped function or call the script
 
         This function is either called with a decorator or directly to call the
-        underlying function. When running with Python 2 the raw function will always
-        be called however in Python 3 the priorities will be applied from the
+        underlying function. The priorities will be applied from the
         dirac.extension_metadata entry_point.
         """
         # If func is provided then the decorator is being applied to a function

src/DIRAC/__init__.py

@@ -244,8 +244,7 @@ def initialize(
         message = '/DIRAC/Setup is not defined. Have you ran "dirac-configure"?'
         if require_auth:
             raise exceptions.NotConfiguredError(message)
-        else:
-            warnings.warn(message, exceptions.DiracWarning)
+        warnings.warn(message, exceptions.DiracWarning)
 
     if require_auth:
         retVal = S_ERROR("No configuration servers found")

src/DIRAC/tests/Workflow/Integration/exe-script.py

@@ -7,4 +7,4 @@
 # Main
 if __name__ == "__main__":
 
-    sys.exit(subprocess.call(shlex.split("echo Hello World")))
+    sys.exit(subprocess.call(shlex.split("echo 'Hello World'")))

tests/Integration/WorkloadManagementSystem/Test_SandboxStoreClient.py

@@ -72,7 +72,7 @@ def test_SSCChain():
 
     jobId = 1
 
-    exeScriptLocation = find_all("exe-script.py", "..", "/DIRAC/tests/Integration")[0]
+    exeScriptLocation = find_all("exe-script.py", "../..", "/DIRAC/tests/Integration")[0]
     fileList = [exeScriptLocation]
 
     res = ssc.uploadFilesAsSandbox(fileList)

tests/Integration/WorkloadManagementSystem/exe-script.py

@@ -7,4 +7,4 @@
 # Main
 if __name__ == "__main__":
 
-    sys.exit(subprocess.call(shlex.split("echo Hello World")))
+    sys.exit(subprocess.call(shlex.split("echo 'Hello World'")))

tests/Integration/WorkloadManagementSystem/inputsandbox/exe-script.py

@@ -27,7 +27,6 @@
 
 def base():
     job = Job()
-    job.setName("helloWorld-TEST-TO-Jenkins")
     executablePath = find_all("exe-script.py", "..", "/DIRAC/tests/Workflow/")[0]
     job.setInputSandbox([executablePath])
     job.setExecutable(executablePath, "", "helloWorld.log")
@@ -41,6 +40,7 @@ def helloJob():
     """Simple Hello Word job to DIRAC.Jenkins.ch"""
     gLogger.info("\n Submitting hello world job targeting DIRAC.Jenkins.ch")
     job = base()
+    job.setName("helloWorld-Jenkins_base")
     result = dirac.submitJob(job)
     gLogger.info("Hello world job: ", result)
     if not result["OK"]:
@@ -52,6 +52,7 @@ def helloMP():
     """Simple Hello Word job to DIRAC.Jenkins.ch, that needs to be matched by a MP WN"""
     gLogger.info("\n Submitting hello world job targeting DIRAC.Jenkins.ch and a MP WN")
     job = base()
+    job.setName("helloWorld-Jenkins_MP")
     job.setNumberOfProcessors(2)
     result = dirac.submitJob(job)
     gLogger.info("Hello world job MP: ", result)

tests/Jenkins/dirac-proxy-download.py

@@ -299,8 +299,7 @@ submitJob() {
     set -e
   fi
 
-  cp "${TESTCODE}/DIRAC/tests/Jenkins/dirac-proxy-download.py" "."
-  python dirac-proxy-download.py "${DIRACUSERDN}" -R "${DIRACUSERROLE}" -o /DIRAC/Security/UseServerCertificate=True -o /DIRAC/Security/CertFile=/home/dirac/certs/hostcert.pem -o /DIRAC/Security/KeyFile=/home/dirac/certs/hostkey.pem -o /DIRAC/Setup="${DIRACSETUP}" -ddd
+  dirac-admin-get-proxy "${DIRACUSERDN}" "${DIRACUSERROLE}" -o /DIRAC/Security/UseServerCertificate=True -o /DIRAC/Security/CertFile=/home/dirac/certs/hostcert.pem -o /DIRAC/Security/KeyFile=/home/dirac/certs/hostkey.pem -o /DIRAC/Setup="${DIRACSETUP}" --out="/tmp/x509up_u${UID}" -ddd
   if [[ -f "${TESTCODE}/${VO}DIRAC/tests/Jenkins/dirac-test-job.py" ]]; then
     cp "${TESTCODE}/${VO}DIRAC/tests/Jenkins/dirac-test-job.py" "."
   else
@@ -959,19 +958,17 @@ startRunsv(){
 downloadProxy() {
   echo '==> [downloadProxy]'
 
-  cp "${TESTCODE}/DIRAC/tests/Jenkins/dirac-proxy-download.py" .
-
   if [[ "${PILOTCFG}" ]]; then
     if [[ -e "${CLIENTINSTALLDIR}/diracos/etc/dirac.cfg" ]]; then # called from the py3 client directory
-      python dirac-proxy-download.py "${DIRACUSERDN}" -R "${DIRACUSERROLE}" -o /DIRAC/Security/UseServerCertificate=True --cfg "${CLIENTINSTALLDIR}/diracos/etc/dirac.cfg" "${PILOTINSTALLDIR}/$PILOTCFG" "${DEBUG}"
+      dirac-admin-get-proxy "${DIRACUSERDN}" "${DIRACUSERROLE}" -o /DIRAC/Security/UseServerCertificate=True --cfg "${CLIENTINSTALLDIR}/diracos/etc/dirac.cfg" "${PILOTINSTALLDIR}/$PILOTCFG" --out="/tmp/x509up_u${UID}" "${DEBUG}"
     else # assuming it's the pilot
-      python dirac-proxy-download.py "${DIRACUSERDN}" -R "${DIRACUSERROLE}" -o /DIRAC/Security/UseServerCertificate=True --cfg "${PILOTINSTALLDIR}/$PILOTCFG" "${DEBUG}"
+      dirac-admin-get-proxy "${DIRACUSERDN}" "${DIRACUSERROLE}" -o /DIRAC/Security/UseServerCertificate=True --cfg "${PILOTINSTALLDIR}/$PILOTCFG" --out="/tmp/x509up_u${UID}" "${DEBUG}"
     fi
   else
     if [[ -e "${CLIENTINSTALLDIR}/diracos/etc/dirac.cfg" ]]; then # called from the py3 client directory
-      python dirac-proxy-download.py "${DIRACUSERDN}" -R "${DIRACUSERROLE}" -o /DIRAC/Security/UseServerCertificate=True --cfg "${CLIENTINSTALLDIR}/diracos/etc/dirac.cfg" "${PILOTINSTALLDIR}/$PILOTCFG" "${DEBUG}"
+      dirac-admin-get-proxy "${DIRACUSERDN}" "${DIRACUSERROLE}" -o /DIRAC/Security/UseServerCertificate=True --cfg "${CLIENTINSTALLDIR}/diracos/etc/dirac.cfg" "${PILOTINSTALLDIR}/etc/dirac.cfg" --out="/tmp/x509up_u${UID}" "${DEBUG}"
     else # assuming it's the pilot
-      python dirac-proxy-download.py "${DIRACUSERDN}" -R "${DIRACUSERROLE}" -o /DIRAC/Security/UseServerCertificate=True --cfg "${PILOTINSTALLDIR}/etc/dirac.cfg" "${DEBUG}"
+      dirac-admin-get-proxy "${DIRACUSERDN}" "${DIRACUSERROLE}" -o /DIRAC/Security/UseServerCertificate=True --cfg "${PILOTINSTALLDIR}/etc/dirac.cfg" --out="/tmp/x509up_u${UID}" "${DEBUG}"
     fi
   fi