Check for proxy validity, not creation

Author: matyasselmeci

osgtest/tests/test_400_proxy.py

@@ -33,7 +33,8 @@ def test_03_grid_proxy_init(self):
         core.state['proxy.created'] = True
 
     def test_04_grid_proxy_info(self):
+        core.state['proxy.valid'] = False
         core.skip_ok_unless_installed('globus-proxy-utils')
-        self.skip_bad_unless(core.state['proxy.created'], 'Proxy creation failed')
         command = ('grid-proxy-info', '-debug')
         core.check_system(command, 'Normal grid-proxy-info', user=True)
+        core.state['proxy.valid'] = True

osgtest/tests/test_410_jobs.py

@@ -58,7 +58,7 @@ def test_02_condor_ce_run_condor(self):
         self.skip_bad_unless(service.is_running('condor-ce'), 'ce not running')
         self.skip_bad_unless(service.is_running('condor'), 'condor not running')
         self.skip_bad_unless(core.state['jobs.env-set'], 'job environment not set')
-        self.skip_bad_unless(core.state['proxy.created'], 'requires a proxy cert')
+        self.skip_bad_unless(core.state['proxy.valid'], 'requires a proxy cert')
 
         command = ('condor_ce_run', '-r', '%s:9619' % core.get_hostname(), '/bin/env')
         self.run_job_in_tmp_dir(command, 'condor_ce_run a Condor job')

osgtest/tests/test_465_xrootd_tpc.py

@@ -17,7 +17,7 @@ def setUp(self):
 
     def test_01_create_macaroons(self):
         core.skip_ok_unless_installed('x509-scitokens-issuer-client', by_dependency=True)
-        self.skip_bad_unless(core.state['proxy.created'], 'Proxy creation failed')
+        self.skip_bad_unless(core.state['proxy.valid'], 'requires a proxy cert')
         core.config['xrootd.tpc.macaroon-1'] = None
         core.config['xrootd.tpc.macaroon-2'] = None
 

osgtest/tests/test_550_condorce.py

@@ -83,7 +83,7 @@ def test_02_queue(self):
 
     def test_03_ping(self):
         self.general_requirements()
-        self.skip_bad_unless(core.state['proxy.created'], 'requires a proxy cert')
+        self.skip_bad_unless(core.state['proxy.valid'], 'requires a proxy cert')
 
         command = ('condor_ce_ping', 'WRITE', '-verbose')
         stdout, _, _ = core.check_system(command, 'ping using GSI and gridmap', user=True)
@@ -92,7 +92,7 @@ def test_03_ping(self):
     def test_04_trace(self):
         self.general_requirements()
         self.skip_bad_unless(core.state['condor-ce.schedd-ready'], 'CE schedd not ready to accept jobs')
-        self.skip_bad_unless(core.state['proxy.created'], 'requires a proxy cert')
+        self.skip_bad_unless(core.state['proxy.valid'], 'requires a proxy cert')
 
         cwd = os.getcwd()
         os.chdir('/tmp')
@@ -108,7 +108,7 @@ def test_05_pbs_trace(self):
         core.skip_ok_unless_installed('torque-mom', 'torque-server', 'torque-scheduler', 'torque-client', 'munge',
                                       by_dependency=True)
         self.skip_ok_unless(service.is_running('pbs_server'), 'pbs service not running')
-        self.skip_bad_unless(core.state['proxy.created'], 'requires a proxy cert')
+        self.skip_bad_unless(core.state['proxy.valid'], 'requires a proxy cert')
         self.run_blahp_trace('pbs')
 
     def test_06_slurm_trace(self):
@@ -117,7 +117,7 @@ def test_06_slurm_trace(self):
         self.skip_bad_unless(service.is_running('munge'), 'slurm requires munge')
         self.skip_bad_unless(core.state['condor-ce.schedd-ready'], 'CE schedd not ready to accept jobs')
         self.skip_ok_unless(service.is_running(core.config['slurm.service-name']), 'slurm service not running')
-        self.skip_bad_unless(core.state['proxy.created'], 'requires a proxy cert')
+        self.skip_bad_unless(core.state['proxy.valid'], 'requires a proxy cert')
         self.run_blahp_trace('slurm')
 
     def test_07_ceview(self):

osgtest/tests/test_580_gfal2util.py

@@ -12,7 +12,7 @@ class TestGFAL2Util(osgunittest.OSGTestCase):
 
 
     def setUp(self):
-        self.skip_ok_unless(core.state['proxy.created'] or core.state['voms.got-proxy'])
+        self.skip_ok_unless(core.state['proxy.valid'] or core.state['voms.got-proxy'])
         core.skip_ok_unless_installed('gfal2-util', 'gfal2-plugin-file')
 
     def get_gftp_url_base(self):

osgtest/tests/test_590_gsiopenssh.py

@@ -21,7 +21,7 @@ class TestGSIOpenSSH(osgunittest.OSGTestCase):
     def setUp(self):
         core.skip_ok_unless_installed('gsi-openssh-server', 'gsi-openssh-clients')
         self.skip_ok_unless(core.state['gsisshd.can-run'], "Couldn't run gsisshd (see above)")
-        self.skip_ok_unless(core.state['proxy.created'] or core.state['voms.got-proxy'], 'no proxy')
+        self.skip_ok_unless(core.state['proxy.valid'] or core.state['voms.got-proxy'], 'no proxy')
         self.skip_bad_unless(core.state['gsisshd.started-service'], 'gsisshd service not running')
         self.port = core.config['gsisshd.port']
 

osgtest/tests/test_960_proxy.py

@@ -5,6 +5,6 @@ class TestGridProxyDestroy(osgunittest.OSGTestCase):
 
     def test_01_check_proxy(self):
         core.skip_ok_unless_installed('globus-proxy-utils')
-        self.skip_ok_unless(core.state['proxy.created'], 'missing proxy')
+        self.skip_ok_unless(core.state['proxy.created'], "didn't create proxy")
         command = ('grid-proxy-destroy', '-debug')
         core.check_system(command, 'Run grid-proxy-destroy', user=True)