Skip to content

Commit eeedb9d

Browse files
committed
Drop brittle check ensuring blahp queries filled the cache
This does not appear to work with an impending version of the blahp: 1. The cache format changed to "<jobid> <hex pickle>" 2. Trace jobs complete too quickly to be picked up by the new caching mechanism, at least for Slurm. Perhaps because the query command changed from scontrol -> squeue.
1 parent f3d8d3c commit eeedb9d

File tree

1 file changed

+1
-31
lines changed

1 file changed

+1
-31
lines changed

osgtest/tests/test_550_condorce.py

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -66,43 +66,13 @@ def run_trace(self, *args):
6666

6767
def run_blahp_trace(self, lrms):
6868
"""Run condor_ce_trace() against a non-HTCondor backend and verify the cache"""
69-
lrms_cache_prefix = {'pbs': 'qstat', 'slurm': 'slurm'}
70-
7169
trace_out, _ = self.run_trace(f'-a osgTestBatchSystem = {lrms.lower()}')
7270

7371
try:
74-
backend_jobid = re.search(r'%s_JOBID=(\d+)' % lrms.upper(), trace_out).group(1)
72+
re.search(r'%s_JOBID=(\d+)' % lrms.upper(), trace_out).group(1)
7573
except AttributeError:
7674
# failed to find backend job ID
7775
self.fail('did not run against %s' % lrms.upper())
78-
cache_file = '/var/tmp/%s_cache_%s/blahp_results_cache' % (lrms_cache_prefix[lrms.lower()],
79-
core.options.username)
80-
with open(cache_file, 'r') as handle:
81-
cache = handle.read()
82-
83-
# Verify backend job ID in cache for multiple formats between the different
84-
# versions of the blahp. For blahp-1.18.16.bosco-1.osg32:
85-
#
86-
# 2: [BatchJobId="2"; WorkerNode="fermicloud171.fnal.gov-0"; JobStatus=4; ExitCode= 0; ]\n
87-
#
88-
# For blahp-1.18.25.bosco-1.osg33:
89-
#
90-
# 5347907 "(dp0
91-
# S'BatchJobId'
92-
# p1
93-
# S'""5347907""'
94-
# p2
95-
# sS'WorkerNode'
96-
# p3
97-
# S'""node1358""'
98-
# p4
99-
# sS'JobStatus'
100-
# p5
101-
# S'2'
102-
# p6
103-
# s."
104-
self.assertTrue(re.search(r'BatchJobId[=\s"\'p1S]+%s' % backend_jobid, cache),
105-
'Job %s not found in %s blahp cache:\n%s' % (backend_jobid, lrms.upper(), cache))
10676

10777
def test_01_status(self):
10878
command = ('condor_ce_status', '-any')

0 commit comments

Comments
 (0)