fix: use absolute imports

Author: fstagni

Pilot/__init__.py

@@ -24,22 +24,13 @@
 import time
 from io import StringIO
 
-try:
-    from Pilot.pilotTools import (
-        Logger,
-        PilotParams,
-        RemoteLogger,
-        getCommand,
-        pythonPathCheck,
-    )
-except ModuleNotFoundError:
-    from pilotTools import (
-        Logger,
-        PilotParams,
-        RemoteLogger,
-        getCommand,
-        pythonPathCheck,
-    )
+from pilotTools import (
+    Logger,
+    PilotParams,
+    RemoteLogger,
+    getCommand,
+    pythonPathCheck,
+)
 
 ############################
 

Pilot/dirac-pilot.py

@@ -30,22 +30,13 @@ def __init__(self, pilotParams):
 from http.client import HTTPSConnection
 from shlex import quote
 
-try:
-    from Pilot.pilotTools import (
-        CommandBase,
-        getSubmitterInfo,
-        retrieveUrlTimeout,
-        safe_listdir,
-        sendMessage,
-    )
-except ModuleNotFoundError:
-    from pilotTools import (
-        CommandBase,
-        getSubmitterInfo,
-        retrieveUrlTimeout,
-        safe_listdir,
-        sendMessage,
-    )
+from pilotTools import (
+    CommandBase,
+    getSubmitterInfo,
+    retrieveUrlTimeout,
+    safe_listdir,
+    sendMessage,
+)
 
 ############################
 

Pilot/pilotCommands.py

@@ -22,10 +22,7 @@
 from urllib.parse import urlencode
 from urllib.request import urlopen
 
-try:
-    from Pilot.proxyTools import getVO
-except ModuleNotFoundError:
-    from proxyTools import getVO
+from proxyTools import getVO
 
 # Utilities functions
 

Pilot/pilotTools.py

@@ -10,12 +10,10 @@
 # imports
 import unittest
 
-try:
-    from Pilot.pilotCommands import CheckWorkerNode, ConfigureSite, NagiosProbes
-    from Pilot.pilotTools import PilotParams
-except ModuleNotFoundError:
-    from pilotCommands import CheckWorkerNode, ConfigureSite, NagiosProbes
-    from pilotTools import PilotParams
+sys.path.insert(0, os.getcwd() + "/Pilot")
+
+from pilotCommands import CheckWorkerNode, ConfigureSite, NagiosProbes
+from pilotTools import PilotParams
 
 
 class PilotTestCase(unittest.TestCase):

Pilot/tests/Test_Pilot.py

@@ -1,16 +1,13 @@
-
 import os
-import shlex
 import shutil
-import subprocess
 import sys
 import unittest
 from unittest.mock import patch
 
-try:
-    from Pilot.proxyTools import getVO, parseASN1
-except ModuleNotFoundError:
-    from proxyTools import getVO, parseASN1
+sys.path.insert(0, os.getcwd() + "/Pilot")
+
+from proxyTools import getVO, parseASN1
+
 
 class TestProxyTools(unittest.TestCase):
     def test_getVO(self):
@@ -23,7 +20,7 @@ def test_getVO(self):
         os.remove(cert)
         self.assertEqual(vo, "fakevo")
 
-    @patch("Pilot.proxyTools.Popen")
+    @patch("proxyTools.Popen")
     def test_getVOPopenFails(self, popenMock):
         """
         Check if an exception is raised when Popen return code is not 0.
@@ -51,7 +48,7 @@ def test_getVOPopenFails(self, popenMock):
             getVO(data)
         self.assertEqual(str(exc.exception), msg)
 
-    @patch("Pilot.proxyTools.Popen")
+    @patch("proxyTools.Popen")
     def test_parseASN1Fails(self, popenMock):
         """Should raise an exception when Popen return code is !=0"""
 
@@ -84,46 +81,7 @@ def __createFakeProxy(self, proxyFile):
         """
         Create a fake proxy locally.
         """
-
         basedir = os.path.dirname(__file__)
-        shutil.copy(basedir + "/certs/user/userkey.pem", basedir + "/certs/user/userkey400.pem")
-        os.chmod(basedir + "/certs/user/userkey400.pem", 0o400)
-        ret = self.createFakeProxy(
-            basedir + "/certs/user/usercert.pem",
-            basedir + "/certs/user/userkey400.pem",
-            "fakeserver.cern.ch:15000",
-            "fakevo",
-            basedir + "/certs//host/hostcert.pem",
-            basedir + "/certs/host/hostkey.pem",
-            basedir + "/certs/ca",
-            proxyFile,
-        )
-        os.remove(basedir + "/certs/user/userkey400.pem")
-        return ret
-
-    def createFakeProxy(self, usercert, userkey, serverURI, vo, hostcert, hostkey, CACertDir, proxyfile):
-        """
-        voms-proxy-fake --cert usercert.pem
-                        --key userkey.pem
-                        -rfc
-                        -fqan "/fakevo/Role=user/Capability=NULL"
-                        -uri fakeserver.cern.ch:15000
-                        -voms fakevo
-                        -hostcert hostcert.pem
-                        -hostkey hostkey.pem
-                        -certdir ca
-        """
-        opt = (
-            '--cert %s --key %s -rfc -fqan "/fakevo/Role=user/Capability=NULL" -uri %s -voms %s -hostcert %s'
-            "  -hostkey %s  -certdir %s -out %s"
-            % (usercert, userkey, serverURI, vo, hostcert, hostkey, CACertDir, proxyfile)
-        )
-        proc = subprocess.Popen(
-            shlex.split("voms-proxy-fake " + opt),
-            bufsize=1,
-            stdout=sys.stdout,
-            stderr=sys.stderr,
-            universal_newlines=True,
-        )
-        proc.communicate()
-        return proc.returncode
+        shutil.copy(basedir + "/certs/voms/proxy.pem", proxyFile)
+        return 0
+

Pilot/tests/Test_proxyTools.py

@@ -4,14 +4,15 @@
 import os
 import random
 import string
+import sys
 import tempfile
 import unittest
 from unittest.mock import patch
 
-try:
-    from Pilot.pilotTools import CommandBase, Logger, PilotParams
-except ModuleNotFoundError:
-    from pilotTools import CommandBase, Logger, PilotParams
+sys.path.insert(0, os.getcwd() + "/Pilot")
+
+from pilotTools import CommandBase, Logger, PilotParams
+
 
 class TestPilotParams(unittest.TestCase):
     @patch("sys.argv")