Addressing style changes

Author: efajardo

osgtest/tests/test_150_xrootd.py

@@ -37,7 +37,7 @@ def test_01_start_xrootd(self):
         core.config['certs.xrootdkey'] = '/etc/grid-security/xrd/xrdkey.pem'
         core.config['xrootd.config'] = '/etc/xrootd/xrootd-clustered.cfg'
         core.config['xrootd.port'] = XROOTD_PORT
-        core.config['xrootd.multiuser'] = "OFF"
+        core.config['xrootd.multiuser'] = False
         core.state['xrootd.started-server'] = False
         core.state['xrootd.backups-exist'] = False
 
@@ -77,15 +77,15 @@ def test_02_configure_hdfs(self):
 
     def test_03_configure_multiuser(self):
         core.skip_ok_unless_installed('xrootd-multiuser','globus-proxy-utils', by_dependency=True)
-        core.config['xrootd.multiuser'] = "ON"
         xrootd_multiuser_conf = "xrootd.fslib libXrdMultiuser.so default"
         files.append(core.config['xrootd.config'], xrootd_multiuser_conf, owner='xrootd', backup=False)
+        core.config['xrootd.multiuser'] = True
 
     def test_04_start_xrootd(self):
         core.skip_ok_unless_installed('xrootd', by_dependency=True)
         if core.el_release() < 7:
             core.config['xrootd_service'] = "xrootd"
-        elif core.config['xrootd.multiuser'] == "ON":
+        elif core.config['xrootd.multiuser']:
             core.config['xrootd_service'] = "xrootd-privileged@clustered"
         else:
             core.config['xrootd_service'] = "xrootd@clustered"

osgtest/tests/test_450_xrootd.py

@@ -40,12 +40,10 @@ def test_01_xrdcp_local_to_server(self):
 
     def test_02_xrootd_multiuser(self):
         core.skip_ok_unless_installed('xrootd', 'xrootd-client', 'globus-proxy-utils', 'xrootd-multiuser', by_dependency=True)
-        self.skip_bad_unless(core.state['xrootd.copied-to-server'] is True, 'File to check ownership does not exist')
-        temp_dir = core.config['xrootd.tmp-dir']
-        if core.config['xrootd.multiuser'] == "ON" and core.state['xrootd.copied-to-server']:
-            file_path = os.path.join(temp_dir, 'copied_file.txt')
-            result_perm = core.check_file_ownership(file_path, core.options.username)
-            self.assertEqual(result_perm, True) 
+        self.skip_bad_unless(core.config['xrootd.multiuser'], 'Xrootd not configured for multiuser')
+        self.skip_bad_unless(core.state['xrootd.copied-to-server'], 'File to check ownership does not exist')
+        file_path = os.path.join(core.config['xrootd.tmp-dir'], 'copied_file.txt')
+        self.assertEqual(core.check_file_ownership(file_path, core.options.username), True) 
 
     def test_03_xrdcp_server_to_local(self):
         core.skip_ok_unless_installed('xrootd', 'xrootd-client', by_dependency=True)