fix: Some minor fixes

Author: Robin VAN DE MERGHEL

Pilot/dirac-pilot.py

@@ -77,7 +77,7 @@
         if not sys.stdin.isatty():
             receivedContent = sys.stdin.read()
         log = RemoteLogger(
-            pilotParams.loggerUR,
+            pilotParams.loggerURL,
             "Pilot",
             bufsize=pilotParams.loggerBufsize,
             pilotUUID=pilotParams.pilotUUID,
@@ -95,7 +95,7 @@
         pythonPathCheck()
     else:
         log.info("Clearing PYTHONPATH for child processes.")
-    if "PYTHONPATH" in os.environ:
+        if "PYTHONPATH" in os.environ:
             os.environ["PYTHONPATH_SAVE"] = os.environ["PYTHONPATH"]
             os.environ["PYTHONPATH"] = ""
 
@@ -138,7 +138,7 @@
 
     if pilotParams.jwt:
         if remote:
-            log.buffer.flush(force=True)
+            log.buffer.flush()
 
         log.info("Revoking pilot token.")
         revokePilotToken(

Pilot/pilotCommands.py

@@ -43,7 +43,6 @@ def __init__(self, pilotParams):
     from shlex import quote
 except ImportError:
     from pipes import quote
-    
 try:
     from Pilot.pilotTools import (
         CommandBase,
@@ -101,7 +100,6 @@ def wrapper(self):
             # unexpected exit: document it and bail out.
             self.log.error(str(exc))
             self.log.error(traceback.format_exc())
-
             raise
         finally:
             self.log.buffer.cancelTimer()
@@ -132,7 +130,6 @@ def __init__(self, pilotParams):
     @logFinalizer
     def execute(self):
         """Get host and local user info, and other basic checks, e.g. space available"""
-        
         self.log.info("Uname      = %s" % " ".join(os.uname()))
         self.log.info("Host Name  = %s" % socket.gethostname())
         self.log.info("Host FQDN  = %s" % socket.getfqdn())
@@ -1229,6 +1226,4 @@ def _runNagiosProbes(self):
     def execute(self):
         """Standard entry point to a pilot command"""
         self._setNagiosOptions()
-        self._runNagiosProbes()
-
-
+        self._runNagiosProbes()

Pilot/proxyTools.py

@@ -2,9 +2,7 @@
 
 from __future__ import absolute_import, division, print_function
 
-from curses import raw
 import json
-from multiprocessing import Value
 import os
 import time
 import re

Pilot/tests/Test_simplePilotLogger.py

@@ -43,6 +43,7 @@ def test_pilotParamsInit(self, argvmock):
         argvmock.__getitem__.assert_called()
         self.assertEqual(argvmock.__getitem__.call_count, 2)  # 2 getopt calls
         self.assertTrue(pp.pilotLogging)
+        self.assertEqual(pp.loggerURL, "dummyURL")
         self.assertTrue(pp.debugFlag)
 
     def test_getOptionForPaths(self):
@@ -104,6 +105,7 @@ def test_pilotOptions(self, argvmock, mockPaths):
         res = pp.getPilotOptionsDict()
         logURL = "https://lbcertifdirac70.cern.ch:8443/WorkloadManagement/TornadoPilotLogging"
         self.assertEqual(res.get("RemoteLoggerURL"), logURL)
+        self.assertEqual(pp.loggerURL, logURL)
         self.assertEqual(res.get("RemoteLogging"), "False")
         self.assertIs(pp.pilotLogging, False)
         self.assertEqual(res.get("UploadPath"), "/gridpp/pilotlogs/")