Merge pull request #154 from efajardo/sw3359

SOFTWARE-3359 (The multiuser tests needs globus proxy utils and the first test to work)

Author: brianhlin

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
 
@@ -76,16 +76,16 @@ def test_02_configure_hdfs(self):
         files.append(core.config['xrootd.config'], hdfs_config, backup=False)
 
     def test_03_configure_multiuser(self):
-        core.skip_ok_unless_installed('xrootd-multiuser')
-        core.config['xrootd.multiuser'] = "ON"
+        core.skip_ok_unless_installed('xrootd-multiuser','globus-proxy-utils', by_dependency=True)
         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

@@ -15,15 +15,15 @@ class TestXrootd(osgunittest.OSGTestCase):
     __fuse_path = '/mnt/xrootd_fuse_test'
 
     def test_01_xrdcp_local_to_server(self):
+        core.state['xrootd.copied-to-server'] = False
         core.skip_ok_unless_installed('xrootd', 'xrootd-client', by_dependency=True)
         core.skip_ok_unless_installed('globus-proxy-utils')
         self.skip_bad_unless(core.state['xrootd.started-server'] is True, 'Server not running')
+        temp_dir = tempfile.mkdtemp()
+        core.config['xrootd.tmp-dir'] = temp_dir
+        user = pwd.getpwnam(core.options.username)
+        os.chown(temp_dir, user[2], user[3])
         hostname = socket.getfqdn()
-        temp_dir = "/tmp/vdttest"
-        if not os.path.exists(temp_dir):
-            os.mkdir(temp_dir)
-            user = pwd.getpwnam(core.options.username)
-            os.chown(temp_dir, user[2], user[3])
         os.chmod(temp_dir, 0o777)
         xrootd_url = 'root://%s:%d/%s/copied_file.txt' % (hostname, core.config['xrootd.port'], temp_dir)
         command = ('xrdcp', '--debug', '3', TestXrootd.__data_path, xrootd_url)
@@ -33,19 +33,17 @@ def test_01_xrdcp_local_to_server(self):
         fail = core.diagnose('xrdcp copy, local to URL',
                              command, status, stdout, stderr)
         file_copied = os.path.exists(os.path.join(temp_dir, 'copied_file.txt'))
-        if core.config['xrootd.multiuser'] != "ON":
-            shutil.rmtree(temp_dir)
+        if file_copied:
+            core.state['xrootd.copied-to-server'] = True
         self.assertEqual(status, 0, fail)
         self.assert_(file_copied, 'Copied file missing')
 
     def test_02_xrootd_multiuser(self):
-        core.skip_ok_unless_installed('xrootd', 'xrootd-client', 'xrootd-multiuser', by_dependency=True)
-        temp_dir = "/tmp/vdttest"
-        if core.config['xrootd.multiuser'] == "ON":
-            file_path = os.path.join(temp_dir, 'copied_file.txt')
-            result_perm = core.check_file_ownership(file_path, core.options.username)
-            shutil.rmtree(temp_dir)
-            self.assertEqual(result_perm, True) 
+        core.skip_ok_unless_installed('xrootd', 'xrootd-client', 'globus-proxy-utils', 'xrootd-multiuser', by_dependency=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)

osgtest/tests/test_840_xrootd.py

@@ -11,7 +11,7 @@ def test_01_stop_xrootd(self):
             files.restore('/etc/xrootd/auth_file', "xrootd")
             if not core.rpm_is_installed('xrootd-lcmaps'):
                 files.restore('/etc/grid-security/xrd/xrdmapfile', "xrootd")
-
         core.skip_ok_unless_installed('xrootd', by_dependency=True)
         self.skip_ok_if(core.state['xrootd.started-server'], 'did not start server')
         service.check_stop(core.config['xrootd_service'])
+        files.remove(core.config['xrootd.tmp-dir'], force=True)