Merge pull request #5 from opensciencegrid/master

Keep my fork up to date

Author: efajardo

.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

files/test_sequence

@@ -9,6 +9,7 @@ test_110_condor_cron
 test_130_gridftp
 test_140_lcmaps
 test_150_xrootd
+test_155_stashcache
 test_160_rsv
 test_170_pbs
 test_180_cvmfs
@@ -25,13 +26,14 @@ test_290_slurm
 test_300_misc
 test_380_cvmfs
 test_400_proxy
-test_480_myproxy
-test_500_voms
+test_403_myproxy
+test_407_voms
 test_410_jobs
 test_420_gridftp
 test_430_uberftp
 test_440_glexec
 test_450_xrootd
+test_460_stashcache
 test_470_rsv
 test_490_jobs
 test_510_edgmkgridmap
@@ -50,6 +52,7 @@ test_790_condorce
 test_800_gratia
 test_820_cvmfs
 test_830_rsv
+test_835_stashcache
 test_840_xrootd
 test_850_lcmaps
 test_860_gridftp

osg-test

@@ -229,7 +229,7 @@ if __name__ == '__main__':
 
     # Check for osg-ca-generator, which may have been forgotten in a source install
     try:
-        __import__('cagen')
+        import cagen
     except ImportError:
         sys.exit("Cannot find 'cagen' library. Please install osg-ca-generator")
 
@@ -254,5 +254,6 @@ if __name__ == '__main__':
         signal.signal(signal.SIGALRM, signal.SIG_DFL)
     else:
         print('No tests to run.')
+        EXIT_CODE = 1
     wrap_up()
     sys.exit(EXIT_CODE)

osgtest/library/core.py

@@ -416,13 +416,17 @@ def version_compare(evr1, evr2):
     as a 3-element tuple or list.
 
     """
-    if isinstance(evr1, basestring):
+    if is_string(evr1):
         epoch1, version1, release1 = stringToVersion(evr1)
+    elif isinstance(evr1, bytes):
+        epoch1, version1, release1 = stringToVersion(evr1.decode())
     else:
         epoch1, version1, release1 = evr1
 
-    if isinstance(evr2, basestring):
+    if is_string(evr2):
         epoch2, version2, release2 = stringToVersion(evr2)
+    elif isinstance(evr2, bytes):
+        epoch2, version2, release2 = stringToVersion(evr2.decode())
     else:
         epoch2, version2, release2 = evr2
 
@@ -634,19 +638,28 @@ 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
+    """
+    try:
+        file_stat = os.stat(file_path)
+        return (check_file_ownership(file_path, owner_name) and
+                file_stat.st_mode & 0o7777 == permissions)
+    except OSError:  # file does not exist
+        return False
 
 def parse_env_output(output):
     """
@@ -755,3 +768,12 @@ def run_fn_if_el_release_ok(*args, **kwargs):
         return run_fn_if_el_release_ok
     return el_release_decorator
 
+
+try:
+    unicode
+except NameError:  # python 3
+    unicode = str
+
+
+def is_string(var):
+    return isinstance(var, (str, unicode))

osgtest/library/files.py

@@ -237,3 +237,12 @@ def filesBackedup(path, owner):
         return True
     else:
         return False
+
+
+def safe_makedirs(directory, mode=0o777):
+    """Create a directory and all its parent directories, unless it already
+    exists.
+
+    """
+    if not os.path.isdir(directory):
+        os.makedirs(directory, mode)

osgtest/library/osgunittest.py

@@ -12,6 +12,19 @@
 import unittest
 import time
 
+
+# Copied from unittest.util, Python 3.6
+_MAX_LENGTH = 80
+def safe_repr(obj, short=False):
+    try:
+        result = repr(obj)
+    except Exception:
+        result = object.__repr__(obj)
+    if not short or len(result) < _MAX_LENGTH:
+        return result
+    return result[:_MAX_LENGTH] + ' [truncated]...'
+
+
 # Define the classes we need to handle the two new types of test results: ok
 # skip, and bad skip.
 
@@ -111,6 +124,14 @@ def failIfSubsetOf(self, a, b, message=None):
         if set(a).issubset(set(b)):
             raise AssertionError(message)
 
+    def assertEqualVerbose(self, actual, expected, message=None):
+        aftermessage = "actual %s != expected %s" % (safe_repr(actual), safe_repr(expected))
+        if message:
+            fullmessage = "%s (%s)" % (message, aftermessage)
+        else:
+            fullmessage = aftermessage
+        self.assertEqual(actual, expected, fullmessage)
+
     # This is mostly a copy of the method from unittest in python 2.4.
     # There is some code here to test if the 'result' object accepts 'skips',
     # since the original TestResult object does not. If it does not, an

osgtest/tests/test_100_condor.py

@@ -14,6 +14,7 @@
 class TestStartCondor(osgunittest.OSGTestCase):
 
     def test_01_start_condor(self):
+        core.state['condor.started-service'] = False
         core.state['condor.running-service'] = False
 
         core.skip_ok_unless_installed('condor')

osgtest/tests/test_150_xrootd.py

@@ -5,6 +5,9 @@
 import osgtest.library.service as service
 import osgtest.library.osgunittest as osgunittest
 
+
+XROOTD_PORT = 1096  # chosen so it doesn't conflict w/ the stashcache instances
+
 XROOTD_CFG_TEXT = """\
 cms.space min 2g 5g
 xrootd.seclib /usr/lib64/libXrdSec-4.so
@@ -17,6 +20,7 @@
     %s
 acc.authdb /etc/xrootd/auth_file
 ofs.authorize
+xrd.port %d
 """
 
 AUTHFILE_TEXT = """\
@@ -32,7 +36,9 @@ def test_01_start_xrootd(self):
         core.config['certs.xrootdcert'] = '/etc/grid-security/xrd/xrdcert.pem'
         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.gsi'] = "ON"
+        core.config['xrootd.multiuser'] = "OFF"
         core.state['xrootd.started-server'] = False
         core.state['xrootd.backups-exist'] = False
 
@@ -58,7 +64,9 @@ def test_01_start_xrootd(self):
                             owner="xrootd",
                             chown=(user.pw_uid, user.pw_gid))
 
-            files.append(core.config['xrootd.config'], XROOTD_CFG_TEXT % sec_protocol, owner='xrootd', backup=True)
+            files.append(core.config['xrootd.config'],
+                         XROOTD_CFG_TEXT % (sec_protocol, core.config['xrootd.port']),
+                         owner='xrootd', backup=True)
             authfile = '/etc/xrootd/auth_file'
             files.write(authfile, AUTHFILE_TEXT, owner="xrootd", chown=(user.pw_uid, user.pw_gid))
 
@@ -69,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"