Skip to content

Tests for PilotCStoJson + users withpout DN #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ptakha wants to merge 6 commits into
base: addDNInformationToJson
Choose a base branch
from
Open

Tests for PilotCStoJson + users withpout DN #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a53df9b
Tests for PilotCStoJson + users withpout DN
ptakha Apr 4, 2019
75d4704
tests+
ptakha Apr 5, 2019
79e8fbf
first attempt to resolve conflict
ptakha Apr 5, 2019
1deb188
Not here
ptakha Apr 5, 2019
0ecfed6
Not here
ptakha Apr 5, 2019
b5a9f94
Attempt to resolve conflict
ptakha Apr 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions WorkloadManagementSystem/Utilities/PilotCStoJSONSynchronizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,12 @@ def _getDNs(self, certGroupName):
usersString = gConfig.getValue('/Registry/Groups/' + certGroupName + '/Users')
usersInGroup = usersString.split(',')
DNs = [gConfig.getValue('/Registry/Users/' + user + '/DN') for user in usersInGroup]
return S_OK(DNs)
except AttributeError:
return S_ERROR('Some error occured while getting the DNs.')
if (DNs == [None]):
return S_ERROR('Users in this group don`t have DN ')
else:
return S_OK(DNs)
except AttributeError as ae:
gLogger.exception("Error occured while getting the DNs", lException=ae)

def _getPilotOptionsPerSetup(self, setup, pilotDict):
""" Given a setup, returns its pilot options in a dictionary
Expand Down
29 changes: 29 additions & 0 deletions WorkloadManagementSystem/Utilities/test/Test_PilotCStoJSONSynchronizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ def setUp(self):
}
}
}
Resources
{
Sites
{

}
}
Systems
{
WorkloadManagement
Expand Down Expand Up @@ -69,6 +76,10 @@ def setUp(self):
CA = /DC=ch/DC=voodo/CN=Voodo Grid Certification Authority
Email = franek.bolek@voodo.pl
}
Nemo
{

}
}
Groups
{
Expand All @@ -83,6 +94,14 @@ def setUp(self):
#@@-ggg@diracAdmin - 2015-07-07 13:40:55
VO = lhcb
}
Empty_group
{

}
Nautilus
{
Users=Nemo
}
}
}
'''
Expand Down Expand Up @@ -129,6 +148,16 @@ def test_failure(self):
res = synchroniser._getDNs('nonExistingGroup')
self.assertFalse(res['OK'])

def test_empty_group(self):
synchronizer = PilotCStoJSONSynchronizer()
res = synchronizer._getDNs('Empty')
self.assertFalse(res['OK'])

def test_user_without_DN(self):
synchronizer = PilotCStoJSONSynchronizer()
res = synchronizer._getDNs('Nautilus')
self.assertFalse(res['OK'])


if __name__ == '__main__':
suite = unittest.defaultTestLoader.loadTestsFromTestCase(PilotCStoJSONSynchronizerTestCase)
Expand Down