Skip to content

Commit b8e2abb

Browse files
committed
fix tabs
1 parent 785d578 commit b8e2abb

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

src/DIRAC/ConfigurationSystem/Client/VOMS2CSSynchronizer.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -352,12 +352,12 @@ def syncCSWithVOMS(self):
352352
groupsWithRole.append(group)
353353
keepGroups = nonVOGroups + groupsWithRole
354354
if not quarantineVOGroup or quarantineVOGroup not in existingGroups:
355-
keepGroups += [defaultVOGroup]
355+
keepGroups += [defaultVOGroup]
356356
if quarantineVOGroup and quarantineVOGroup in existingGroups:
357-
keepGroups = [quarantineVOGroup]
357+
keepGroups = [quarantineVOGroup]
358358
for group in existingGroups:
359-
if group in nonVOGroups:
360-
continue
359+
if group in nonVOGroups:
360+
continue
361361
role = diracVOMSMapping.get(group, '')
362362
# Among already existing groups for the user keep those without a special VOMS Role
363363
# because this membership is done by hand in the CS

src/DIRAC/FrameworkSystem/Agent/test/Test_ComponentSupervisionAgent.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ def gVal(*args, **_kwargs):
598598
if 'Protocol' in args[0]:
599599
return 'https' if 'Serv3' in args[0] else args[1]
600600
else:
601-
assert False, 'Unknown config option requested %s' % args[0]
601+
assert False, 'Unknown config option requested %s' % args[0]
602602
gConfigMock = MagicMock()
603603
gConfigMock.getValue.side_effect = gVal
604604
services = {'Services': {'Sys': {'Serv1': {'Setup': True, 'PID': '18128', 'Port': '1001', 'RunitStatus': 'Run',
@@ -616,9 +616,9 @@ def gVal(*args, **_kwargs):
616616
with patch('DIRAC.FrameworkSystem.Agent.ComponentSupervisionAgent.gConfig', new=gConfigMock), \
617617
patch('DIRAC.FrameworkSystem.Agent.ComponentSupervisionAgent.socket.gethostname', return_value=host), \
618618
patch('DIRAC.FrameworkSystem.Agent.ComponentSupervisionAgent.PathFinder.getComponentSection',
619-
side_effect=mockComponentSection), \
620-
patch('DIRAC.FrameworkSystem.Agent.ComponentSupervisionAgent.PathFinder.getSystemURLSection',
621-
side_effect=mockURLSection):
619+
side_effect=mockComponentSection), \
620+
patch('DIRAC.FrameworkSystem.Agent.ComponentSupervisionAgent.PathFinder.getSystemURLSection',
621+
side_effect=mockURLSection):
622622
res = self.restartAgent.checkURLs()
623623
self.assertTrue(res['OK'])
624624
self.restartAgent.csAPI.modifyValue.assert_has_calls([call('/Systems/Sys/Production/URLs/Serv', ','.join(tempurls)),
@@ -636,17 +636,17 @@ def test_checkURLs_2(self):
636636

637637
self.restartAgent.csAPI.commit = MagicMock(return_value=S_ERROR('Nope'))
638638
with patch('DIRAC.FrameworkSystem.Agent.ComponentSupervisionAgent.gConfig', new=MagicMock()), \
639-
patch('DIRAC.FrameworkSystem.Agent.ComponentSupervisionAgent.PathFinder.getComponentSection',
640-
side_effect=mockComponentSection):
639+
patch('DIRAC.FrameworkSystem.Agent.ComponentSupervisionAgent.PathFinder.getComponentSection',
640+
side_effect=mockComponentSection):
641641
res = self.restartAgent.checkURLs()
642642
self.assertFalse(res['OK'])
643643
self.assertIn('Failed to commit', res['Message'])
644644
self.assertIn('Commit to CS failed', self.restartAgent.errors[0])
645645

646646
self.restartAgent.csAPI.commit = MagicMock(return_value=S_OK())
647647
with patch('DIRAC.FrameworkSystem.Agent.ComponentSupervisionAgent.gConfig', new=MagicMock()), \
648-
patch('DIRAC.FrameworkSystem.Agent.ComponentSupervisionAgent.PathFinder.getComponentSection',
649-
side_effect=mockComponentSection):
648+
patch('DIRAC.FrameworkSystem.Agent.ComponentSupervisionAgent.PathFinder.getComponentSection',
649+
side_effect=mockComponentSection):
650650

651651
res = self.restartAgent.checkURLs()
652652
self.assertTrue(res['OK'])

src/DIRAC/Resources/Storage/EchoStorage.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,11 @@ def _createSingleDirectory(self, path):
153153

154154
def _removeSingleFile(self, path):
155155
""" Removal on Echo is unbearably slow.
156-
A ticket was opened, but the claim is that "it's CEPH, no can do"
157-
(https://ggus.eu/index.php?mode=ticket_info&ticket_id=140773)
156+
A ticket was opened, but the claim is that "it's CEPH, no can do"
157+
(https://ggus.eu/index.php?mode=ticket_info&ticket_id=140773)
158158
159-
This throttles a bit the removal if we see we start taking too long.
160-
It is mostly useful in the context of the REA.
159+
This throttles a bit the removal if we see we start taking too long.
160+
It is mostly useful in the context of the REA.
161161
"""
162162

163163
startTime = default_timer()

src/DIRAC/Resources/Storage/GFAL2_StorageBase.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ def _putSingleFile(self, src_file, dest_url, sourceSize):
359359
return S_OK(sourceSize)
360360
# no checksum check, compare file sizes for verfication
361361
else:
362-
res = self._getSingleFileSize(dest_url)
362+
res = self._getSingleFileSize(dest_url)
363363
# In case of failure, we set destSize to None
364364
# so that the cleaning of the file happens
365365
if not res['OK']:
@@ -373,7 +373,7 @@ def _putSingleFile(self, src_file, dest_url, sourceSize):
373373
else:
374374
log.debug("Source and destination file size don't match.\
375375
Trying to remove destination file")
376-
res = self._removeSingleFile(dest_url)
376+
res = self._removeSingleFile(dest_url)
377377
if not res['OK']:
378378
log.debug("Failed to remove destination file", res['Message'])
379379
return res
@@ -1220,8 +1220,8 @@ def _listSingleDirectory(self, path, internalCall=False):
12201220
:param self: self reference
12211221
:param str path: single path on storage (srm://...)
12221222
:param bool internalCall: if we call this method from another internal method we want
1223-
to work with the full pfn. Used for _getSingleDirectory and
1224-
_removeSingleDirectory
1223+
to work with the full pfn. Used for _getSingleDirectory and
1224+
_removeSingleDirectory
12251225
:returns: S_ERROR( errStr ) if there is an error
12261226
S_OK( dictionary ): Key: SubDirs and Files
12271227
The values of the Files are dictionaries with filename as key and metadata as value
@@ -1505,7 +1505,7 @@ def _putSingleDirectory(self, src_directory, dest_directory):
15051505
directoryFiles[remoteUrl] = localPath
15061506
# localPath is another folder, start recursion
15071507
else:
1508-
res = self._putSingleDirectory(localPath, remoteUrl)
1508+
res = self._putSingleDirectory(localPath, remoteUrl)
15091509
if not res['OK']:
15101510
log.debug('Failed to put directory to storage. Skipping', res['Message'])
15111511
allSuccessful = False
@@ -1610,7 +1610,7 @@ def _removeSingleDirectory(self, path, recursive=False):
16101610
# Recursively remove the sub directories
16111611
log.debug("Trying to recursively remove %s folder." % len(subDirsDict))
16121612
for subDirUrl in subDirsDict:
1613-
res = self._removeSingleDirectory(subDirUrl, recursive)
1613+
res = self._removeSingleDirectory(subDirUrl, recursive)
16141614
if not res['OK']:
16151615
log.debug("Recursive removal failed", res)
16161616
removedAllDirs = False

0 commit comments

Comments
 (0)