Pylint cleanups

Author: brianhlin

osgtest/tests/test_190_condorce.py

@@ -1,14 +1,13 @@
 import cagen
-import re
 
 import osgtest.library.core as core
 import osgtest.library.files as files
 import osgtest.library.osgunittest as osgunittest
 import osgtest.library.condor as condor
 import osgtest.library.service as service
 
+
 class TestStartCondorCE(osgunittest.OSGTestCase):
-    # Tests 01-02 are needed to reconfigure condor to work with HTCondor-CE
     def test_01_configure_condor(self):
         core.skip_ok_unless_installed('condor', 'htcondor-ce', 'htcondor-ce-client')
 
@@ -34,7 +33,7 @@ def test_02_reconfigure_condor(self):
 
         command = ('condor_reconfig', '-debug')
         core.check_system(command, 'Reconfigure Condor')
-        self.assert_(service.is_running('condor', timeout=10), 'Condor not running after reconfig')
+        self.assertTrue(service.is_running('condor', timeout=10), 'Condor not running after reconfig')
 
     def test_02_scitoken_mapping(self):
         core.skip_ok_unless_installed('condor', 'htcondor-ce')

osgtest/tests/test_550_condorce.py

@@ -8,7 +8,6 @@
 except ImportError:
     from urllib.request import urlopen
 
-import osgtest.library.condor as condor
 import osgtest.library.core as core
 import osgtest.library.files as files
 import osgtest.library.service as service
@@ -20,6 +19,8 @@ class TestCondorCE(osgunittest.OSGTestCase):
     def setUp(self):
         # Enforce GSI auth for testing
         os.environ['_condor_SEC_CLIENT_AUTHENTICATION_METHODS'] = 'GSI'
+        core.skip_ok_unless_installed('condor', 'htcondor-ce', 'htcondor-ce-client')
+        self.skip_bad_unless(service.is_running('condor-ce'), 'ce not running')
 
     def tearDown(self):
         os.environ.pop('_condor_SEC_CLIENT_AUTHENTICATION_METHODS')
@@ -64,37 +65,27 @@ def run_blahp_trace(self, lrms):
         # S'2'
         # p6
         # s."
-        self.assert_(re.search(r'BatchJobId[=\s"\'p1S]+%s' % backend_jobid, cache),
-                     'Job %s not found in %s blahp cache:\n%s' % (backend_jobid, lrms.upper(), cache))
+        self.assertTrue(re.search(r'BatchJobId[=\s"\'p1S]+%s' % backend_jobid, cache),
+                        'Job %s not found in %s blahp cache:\n%s' % (backend_jobid, lrms.upper(), cache))
 
         os.chdir(cwd)
 
-    def general_requirements(self):
-        core.skip_ok_unless_installed('condor', 'htcondor-ce', 'htcondor-ce-client')
-        self.skip_bad_unless(service.is_running('condor-ce'), 'ce not running')
-
     def test_01_status(self):
-        self.general_requirements()
-
         command = ('condor_ce_status', '-any')
         core.check_system(command, 'ce status', user=True)
 
     def test_02_queue(self):
-        self.general_requirements()
-
         command = ('condor_ce_q', '-verbose')
         core.check_system(command, 'ce queue', user=True)
 
     def test_03_ping(self):
-        self.general_requirements()
         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)
-        self.assert_(re.search(r'Authorized:\s*TRUE', stdout), 'could not authorize with GSI')
+        self.assertTrue(re.search(r'Authorized:\s*TRUE', stdout), 'could not authorize with GSI')
 
     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.valid'], 'requires a proxy cert')
 
@@ -107,7 +98,6 @@ def test_04_trace(self):
         os.chdir(cwd)
 
     def test_05_pbs_trace(self):
-        self.general_requirements()
         self.skip_bad_unless(core.state['condor-ce.schedd-ready'], 'CE schedd not ready to accept jobs')
         core.skip_ok_unless_installed('torque-mom', 'torque-server', 'torque-scheduler', 'torque-client', 'munge',
                                       by_dependency=True)
@@ -116,7 +106,6 @@ def test_05_pbs_trace(self):
         self.run_blahp_trace('pbs')
 
     def test_06_slurm_trace(self):
-        self.general_requirements()
         core.skip_ok_unless_installed(core.SLURM_PACKAGES)
         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')
@@ -126,7 +115,6 @@ def test_06_slurm_trace(self):
 
     def test_07_ceview(self):
         core.config['condor-ce.view-listening'] = False
-        self.general_requirements()
         core.skip_ok_unless_installed('htcondor-ce-view')
         view_url = 'http://%s:%s' % (core.get_hostname(), int(core.config['condor-ce.view-port']))
         try:
@@ -141,6 +129,5 @@ def test_07_ceview(self):
                 debug_contents += 'Failed to read %s\n' % debug_file
             core.log_message(debug_contents)
             self.fail('Could not reach HTCondor-CE View at %s: %s' % (view_url, err))
-        self.assert_(re.search(r'HTCondor-CE Overview', src), 'Failed to find expected CE View contents')
+        self.assertTrue(re.search(r'HTCondor-CE Overview', src), 'Failed to find expected CE View contents')
         core.config['condor-ce.view-listening'] = True
-