Merge pull request #631 from htcondor/V24_x-HTCONDOR-2688-fix-old-python

HTCONDOR-2688 fix-old-python

Author: timtheisen

src/condor_ce_trace

@@ -47,7 +47,7 @@ def run_ping(collector_name, schedd_name):
     try:
         rc, stdout, _ = ce.run_command(args)
     except RuntimeError as exc:
-        raise ce.CondorRunException('Failed to ping %s due to the following error:\n%s' % (address, exc))
+        raise ce.CondorRunException('Failed to ping %s due to the following error:\n%s' % (schedd_name, exc))
 
     if G_DEBUG:
         print("*"*5, "condor_ping output", "*"*5)
@@ -149,7 +149,6 @@ def check_job_submit(job_info, schedd_ad, setup_creds=True):
     except RuntimeError as exc:
         raise ce.CondorRunException(f"Failed to contact schedd at {schedd_ad['Machine']} due to the following error:\n{exc}")
     print(f"Submitting job to schedd {schedd_ad['MyAddress']}")
-    ad_results = []
     try:
         result = schedd.submit(htcondor.Submit(sub), 1, True)
     except RuntimeError as exc:

src/htcondorce/rrd.py

@@ -135,9 +135,6 @@ def generate_graph(interval, *args):
 
 def graph(environ, host, plot, interval):
 
-    if plot not in ['jobs', 'vos', 'metrics']:
-        raise ValueError("Unknown plot type requested.")
-
     if plot == "jobs":
         fname = check_rrd(environ, host, plot)
         graph = generate_graph(interval,
@@ -210,7 +207,8 @@ def graph(environ, host, plot, interval):
             "GPRINT:metric:LAST:%-6.0lf",
             "COMMENT:\\n",
             )
-
+    else:
+        raise ValueError("Unknown plot type requested.")
 
     return graph
 

tests/test_condor_ce_router_defaults.py

@@ -1,7 +1,8 @@
 #/usr/bin/env python3
 """Unit tests for condor_ce_router_defaults"""
 
-import importlib
+import importlib.machinery
+import importlib.util
 import os
 import re
 import unittest
@@ -10,7 +11,10 @@
 UID_FILE_PATH = 'uid_table.txt'
 DEFAULTS_PATH = os.path.join('..', 'src', 'condor_ce_router_defaults')
 
-defaults = importlib.load_source('condor_ce_router_defaults', DEFAULTS_PATH)
+loader = importlib.machinery.SourceFileLoader('condor_ce_router_defaults', DEFAULTS_PATH)
+spec = importlib.util.spec_from_loader(loader.name, loader)
+defaults = importlib.util.module_from_spec(spec)
+loader.exec(defaults)
 
 class TestDefaults(unittest.TestCase):
     """Unit tests for condor_ce_router_defaults"""