Skip to content

Commit 62f2931

Browse files
author
efajardo
committed
Check that if multiuser is isntalled the file copied is owned by vdttest
1 parent 333f493 commit 62f2931

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

osgtest/tests/test_150_xrootd.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def test_03_configure_multiuser(self):
7474
core.skip_ok_unless_installed('xrootd-multiuser')
7575
core.config['xrootd.multiuser'] = "ON"
7676
# We need both multiuser and gsi part to test multiuser
77-
if core.config['xrootd.multiuser'] == "ON" && core.config['xrootd.gsi'] == "ON":
77+
if core.config['xrootd.multiuser'] == "ON" and core.config['xrootd.gsi'] == "ON":
7878
xrootd_multiuser_conf = "xrootd.fslib libXrdMultiuser.so default"
7979
files.append(core.config['xrootd.config'], xrootd_multiuser_conf, owner='xrootd', backup=True)
8080

osgtest/tests/test_450_xrootd.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,13 @@ def test_01_xrdcp_local_to_server(self):
4343
self.assertEqual(status, 0, fail)
4444
self.assert_(file_copied, 'Copied file missing')
4545

46-
def test_02_xrdcp_server_to_local(self):
46+
def test_02_test_multiuser(self):
47+
core.skip_ok_unless_installed('xrootd', 'xrootd-client', 'xrootd-multiuser', by_dependency=True)
48+
if core.config['xrootd.multiuser'] == "ON":
49+
success = core.check_file_and_perms("/tmp/vdttest/copied_file.txt","vdttest",0o7777)
50+
self.assert_(success, "Copied file is not owned by vdttest")
51+
52+
def test_03_xrdcp_server_to_local(self):
4753
core.skip_ok_unless_installed('xrootd', 'xrootd-client', by_dependency=True)
4854
if core.config['xrootd.gsi'] == "ON":
4955
core.skip_ok_unless_installed('globus-proxy-utils')
@@ -72,7 +78,7 @@ def test_02_xrdcp_server_to_local(self):
7278
self.assertEqual(status, 0, fail)
7379
self.assert_(file_copied, 'Copied file missing')
7480

75-
def test_03_xrootd_fuse(self):
81+
def test_04_xrootd_fuse(self):
7682
# This tests xrootd-fuse using a mount in /mnt
7783
core.skip_ok_unless_installed('xrootd', 'xrootd-client', by_dependency=True)
7884
self.skip_ok_unless(os.path.exists("/mnt"), "/mnt did not exist")

0 commit comments

Comments
 (0)