Merge pull request #139 from brianhlin/sw3473_setup_personal_condor

Setup personal condor (SOFTWARE-3473)

Author: timtheisen

osgtest/tests/test_10_condor.py

@@ -1,8 +1,16 @@
+from os.path import join
+
 import osgtest.library.core as core
+import osgtest.library.files as files
 import osgtest.library.condor as condor
 import osgtest.library.osgunittest as osgunittest
 import osgtest.library.service as service
 
+personal_condor_config = '''
+DAEMON_LIST = COLLECTOR, MASTER, NEGOTIATOR, SCHEDD, STARTD
+CONDOR_HOST = $(FULL_HOSTNAME)
+'''
+
 class TestStartCondor(osgunittest.OSGTestCase):
 
     def test_01_start_condor(self):
@@ -15,6 +23,9 @@ def test_01_start_condor(self):
             core.state['condor.running-service'] = True
             return
 
+        core.config['condor.personal_condor'] = join(condor.config_val('LOCAL_CONFIG_DIR'), '99-personal-condor.conf')
+        files.write(core.config['condor.personal_condor'], personal_condor_config, owner='condor', chmod=0o644)
+
         core.config['condor.collectorlog_stat'] = core.get_stat(core.config['condor.collectorlog'])
 
         service.check_start('condor')

osgtest/tests/test_89_condor.py

@@ -1,11 +1,13 @@
 import osgtest.library.core as core
+import osgtest.library.files as files
 import osgtest.library.service as service
 import osgtest.library.osgunittest as osgunittest
 
 class TestStopCondor(osgunittest.OSGTestCase):
 
     def test_01_stop_condor(self):
         core.skip_ok_unless_installed('condor')
-        self.skip_ok_if(core.state['condor.started-service'] == False, 'did not start server')
+        self.skip_ok_unless(core.state['condor.started-service'], 'did not start server')
         service.check_stop('condor')
+        files.restore(core.config['condor.personal_condor'], 'condor')
         core.state['condor.running-service'] = False