sweep: #5782 Fix mocking of psutil

Author: chrisburr

src/DIRAC/FrameworkSystem/Agent/test/Test_ComponentSupervisionAgent.py

@@ -444,7 +444,7 @@ def test_restartInstance(self):
         psMock = self.getPSMock()
         psMock.Process = MagicMock("RaisingProc")
         psMock.Error = psutil.Error
-        psMock.Process.side_effect = psutil.Error()
+        psMock.Process.side_effect = psutil.AccessDenied()
         with patch("DIRAC.FrameworkSystem.Agent.ComponentSupervisionAgent.psutil", new=psMock):
             res = self.restartAgent.restartInstance(12345, "agentX", True)
         self.assertFalse(res["OK"])

tests/Jenkins/dirac_ci.sh

@@ -253,11 +253,8 @@ fullInstallDIRAC() {
   echo 'Content of etc/Production.cfg:'
   cat "${SERVERINSTALLDIR}/etc/Production.cfg"
 
-  echo "==> Restarting Framework ProxyManager"
-  dirac-restart-component Framework ProxyManager ${DEBUG}
-
-  echo "==> Restarting Framework ComponentMonitoring"
-  dirac-restart-component Framework ComponentMonitoring ${DEBUG}
+  echo "==> Restarting Framework services"
+  dirac-restart-component Framework '*' ${DEBUG}
 
   #Now all the rest