Skip to content

Commit 8f24c17

Browse files
committed
Whitespace fixups
1 parent 249c4a8 commit 8f24c17

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

osgtest/tests/test_150_xrootd.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,13 @@
2626
u xrootd /tmp a
2727
"""
2828

29+
2930
class TestStartXrootd(osgunittest.OSGTestCase):
3031

3132
def setUp(self):
3233
if core.rpm_is_installed("xcache"):
33-
self.skip_ok_if(core.PackageVersion("xcache") >= "1.0.2", "xcache 1.0.2+ configs conflict with xrootd tests")
34+
self.skip_ok_if(core.PackageVersion("xcache") >= "1.0.2",
35+
"xcache 1.0.2+ configs conflict with xrootd tests")
3436

3537
def test_01_start_xrootd(self):
3638
core.config['xrootd.pid-file'] = '/var/run/xrootd/xrootd-default.pid'
@@ -86,7 +88,7 @@ def test_02_configure_hdfs(self):
8688
files.append(core.config['xrootd.config-extra'], hdfs_config, backup=False)
8789

8890
def test_03_configure_multiuser(self):
89-
core.skip_ok_unless_installed('xrootd-multiuser','globus-proxy-utils', by_dependency=True)
91+
core.skip_ok_unless_installed('xrootd-multiuser', 'globus-proxy-utils', by_dependency=True)
9092
xrootd_multiuser_conf = "xrootd.fslib libXrdMultiuser.so default"
9193
if core.PackageVersion('xrootd') < '1:4.9.0':
9294
files.append(core.config['xrootd.config'], xrootd_multiuser_conf, owner='xrootd', backup=False)

osgtest/tests/test_450_xrootd.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ class TestXrootd(osgunittest.OSGTestCase):
1616

1717
def setUp(self):
1818
if core.rpm_is_installed("xcache"):
19-
self.skip_ok_if(core.PackageVersion("xcache") >= "1.0.2", "xcache 1.0.2+ configs conflict with xrootd tests")
19+
self.skip_ok_if(core.PackageVersion("xcache") >= "1.0.2",
20+
"xcache 1.0.2+ configs conflict with xrootd tests")
2021

2122
def test_01_xrdcp_local_to_server(self):
2223
core.state['xrootd.copied-to-server'] = False
@@ -43,11 +44,12 @@ def test_01_xrdcp_local_to_server(self):
4344
self.assert_(file_copied, 'Copied file missing')
4445

4546
def test_02_xrootd_multiuser(self):
46-
core.skip_ok_unless_installed('xrootd', 'xrootd-client', 'globus-proxy-utils', 'xrootd-multiuser', by_dependency=True)
47+
core.skip_ok_unless_installed('xrootd', 'xrootd-client', 'globus-proxy-utils', 'xrootd-multiuser',
48+
by_dependency=True)
4749
self.skip_bad_unless(core.config['xrootd.multiuser'], 'Xrootd not configured for multiuser')
4850
self.skip_bad_unless(core.state['xrootd.copied-to-server'], 'File to check ownership does not exist')
4951
file_path = os.path.join(core.config['xrootd.tmp-dir'], 'copied_file.txt')
50-
self.assertEqual(core.check_file_ownership(file_path, core.options.username), True)
52+
self.assertEqual(core.check_file_ownership(file_path, core.options.username), True)
5153

5254
def test_03_xrdcp_server_to_local(self):
5355
core.skip_ok_unless_installed('xrootd', 'xrootd-client', by_dependency=True)

osgtest/tests/test_840_xrootd.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
import osgtest.library.service as service
44
import osgtest.library.osgunittest as osgunittest
55

6+
67
class TestStopXrootd(osgunittest.OSGTestCase):
78
def setUp(self):
89
if core.rpm_is_installed("xcache"):
9-
self.skip_ok_if(core.PackageVersion("xcache") >= "1.0.2", "xcache 1.0.2+ configs conflict with xrootd tests")
10+
self.skip_ok_if(core.PackageVersion("xcache") >= "1.0.2",
11+
"xcache 1.0.2+ configs conflict with xrootd tests")
1012

1113
def test_01_stop_xrootd(self):
1214
if core.state['xrootd.backups-exist']:

0 commit comments

Comments
 (0)