Merge pull request #149 from efajardo/sw3359

SOFTWARE-3359 Add Xrootd multiuser tests

Author: brianhlin

.travis.yml

@@ -1,10 +1,11 @@
 sudo: required
 env:
   matrix:
-  - OS_TYPE=centos OS_VERSION=6 PACKAGES=osg-ce-condor,rsv,vo-client-lcmaps-voms,llrun
-  - OS_TYPE=centos OS_VERSION=6 PACKAGES=osg-gridftp,rsv,lcmaps,lcmaps-db-templates,vo-client-lcmaps-voms,rsv,llrun
-  - OS_TYPE=centos OS_VERSION=7 PACKAGES=osg-ce-condor,rsv,vo-client-lcmaps-voms,llrun,singularity-runtime,osg-oasis
-  - OS_TYPE=centos OS_VERSION=7 PACKAGES=osg-gridftp,rsv,lcmaps,lcmaps-db-templates,vo-client-lcmaps-voms,rsv,llrun,singularity-runtime,osg-oasis
+   - OS_TYPE=centos OS_VERSION=6 PACKAGES=osg-ce-condor,rsv,vo-client-lcmaps-voms,llrun
+   - OS_TYPE=centos OS_VERSION=6 PACKAGES=osg-gridftp,rsv,lcmaps,lcmaps-db-templates,vo-client-lcmaps-voms,rsv,llrun
+   - OS_TYPE=centos OS_VERSION=7 PACKAGES=osg-ce-condor,rsv,vo-client-lcmaps-voms,llrun,singularity-runtime,osg-oasis
+   - OS_TYPE=centos OS_VERSION=7 PACKAGES=osg-gridftp,rsv,lcmaps,lcmaps-db-templates,vo-client-lcmaps-voms,rsv,llrun,singularity-runtime,osg-oasis
+   - OS_TYPE=centos OS_VERSION=7 PACKAGES=xrootd,xrootd-client,xrootd-multiuser,globus-proxy-utils
 
 services:
   - docker

osgtest/library/core.py

@@ -638,19 +638,25 @@ def get_hostname():
     except socket.error:
         return None
 
+def check_file_ownership(file_path, owner_name):
+    """Return True if at 'file_path' exists, is owned by
+    'owner_name' and is a file
+    """
+    owner_uid = pwd.getpwnam(owner_name)
+    try:
+        file_stat = os.stat(file_path)
+        return (file_stat.st_uid == owner_uid.pw_uid and
+                stat.S_ISREG(file_stat.st_mode))
+    except OSError:  # file does not exist                                                                                                                                                          
+        return False
 
 def check_file_and_perms(file_path, owner_name, permissions):
-        """Return True if the file at 'file_path' exists, is owned by
-        'owner_name', is a file, and has the given permissions; False otherwise
-         """
-        owner_uid = pwd.getpwnam(owner_name)
-        try:
-            file_stat = os.stat(file_path)
-            return (file_stat.st_uid == owner_uid and
-                    file_stat.st_mode & 0o7777 == permissions and
-                    stat.S_ISREG(file_stat.st_mode))
-        except OSError:  # file does not exist
-            return False
+    """Return True if the file at 'file_path' exists, is owned by
+    'owner_name', is a file, and has the given permissions; False otherwise
+    """
+    file_stat = os.stat(file_path)
+    return (check_file_ownership(file_path, owner_name) and 
+               file_stat.st_mode & 0o7777 == permissions)
 
 def parse_env_output(output):
     """

osgtest/tests/test_150_xrootd.py

@@ -38,6 +38,7 @@ def test_01_start_xrootd(self):
         core.config['xrootd.config'] = '/etc/xrootd/xrootd-clustered.cfg'
         core.config['xrootd.port'] = XROOTD_PORT
         core.config['xrootd.gsi'] = "ON"
+        core.config['xrootd.multiuser'] = "OFF"
         core.state['xrootd.started-server'] = False
         core.state['xrootd.backups-exist'] = False
 
@@ -76,10 +77,20 @@ def test_02_configure_hdfs(self):
         hdfs_config = "ofs.osslib /usr/lib64/libXrdHdfs.so"
         files.append(core.config['xrootd.config'], hdfs_config, backup=False)
 
-    def test_03_start_xrootd(self):
+    def test_03_configure_multiuser(self):
+        core.skip_ok_unless_installed('xrootd-multiuser')
+        core.config['xrootd.multiuser'] = "ON"
+        # We need both multiuser and gsi part to test multiuser
+        if core.config['xrootd.multiuser'] == "ON" and core.config['xrootd.gsi'] == "ON":
+           xrootd_multiuser_conf = "xrootd.fslib libXrdMultiuser.so default"
+           files.append(core.config['xrootd.config'], xrootd_multiuser_conf, owner='xrootd', backup=False)
+      
+    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":
+            core.config['xrootd_service'] = "xrootd-privileged@clustered"
         else:
             core.config['xrootd_service'] = "xrootd@clustered"
 

osgtest/tests/test_450_xrootd.py

@@ -19,10 +19,9 @@ def test_01_xrdcp_local_to_server(self):
         if core.config['xrootd.gsi'] == "ON":
             core.skip_ok_unless_installed('globus-proxy-utils')
         self.skip_bad_unless(core.state['xrootd.started-server'] is True, 'Server not running')
-
+        temp_dir = "/tmp/vdttest"
         hostname = socket.getfqdn()
         if core.config['xrootd.gsi'] == "ON":
-            temp_dir = "/tmp/vdttest"
             if not os.path.exists(temp_dir):
                 os.mkdir(temp_dir)
                 user = pwd.getpwnam(core.options.username)
@@ -38,12 +37,21 @@ 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'))
-        shutil.rmtree(temp_dir)
-
+        if core.config['xrootd.multiuser'] != "ON":
+            shutil.rmtree(temp_dir)
         self.assertEqual(status, 0, fail)
         self.assert_(file_copied, 'Copied file missing')
 
-    def test_02_xrdcp_server_to_local(self):
+    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) 
+
+    def test_03_xrdcp_server_to_local(self):
         core.skip_ok_unless_installed('xrootd', 'xrootd-client', by_dependency=True)
         if core.config['xrootd.gsi'] == "ON":
             core.skip_ok_unless_installed('globus-proxy-utils')
@@ -72,7 +80,7 @@ def test_02_xrdcp_server_to_local(self):
         self.assertEqual(status, 0, fail)
         self.assert_(file_copied, 'Copied file missing')
 
-    def test_03_xrootd_fuse(self):
+    def test_04_xrootd_fuse(self):
         # This tests xrootd-fuse using a mount in /mnt
         core.skip_ok_unless_installed('xrootd', 'xrootd-client', by_dependency=True)
         self.skip_ok_unless(os.path.exists("/mnt"), "/mnt did not exist")