Revision 5acc6853
Correction des tests de VigiGraph.
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@5137 b22e2e97-25c9-44ff-b637-2e5ceca36478
| vigigraph/controllers/rpc.py | ||
|---|---|---|
| 503 | 503 |
SupItemGroup.idgroup.in_(id_list)) |
| 504 | 504 |
groups = [] |
| 505 | 505 |
for group in db_groups.all(): |
| 506 |
#if group.has_children() or len(group.hosts)>0: |
|
| 507 | 506 |
groups.append({
|
| 508 | 507 |
'id' : group.idgroup, |
| 509 | 508 |
'name' : group.name, |
| ... | ... | |
| 655 | 654 |
user = get_current_user() |
| 656 | 655 |
is_manager = in_group('managers').is_met(request.environ)
|
| 657 | 656 |
if not is_manager: |
| 658 |
user_groups = [ug[0] for ug in user.supitemgroups() if ug[1]]
|
|
| 657 |
user_groups = [ug[0] for ug in user.supitemgroups()] |
|
| 659 | 658 |
root_groups = root_groups.filter( |
| 660 | 659 |
SupItemGroup.idgroup.in_(user_groups)) |
| 661 | 660 |
|
| 662 | 661 |
groups = [] |
| 663 | 662 |
for group in root_groups.all(): |
| 664 |
#if group.has_children() or len(group.hosts)>0: |
|
| 665 | 663 |
groups.append({
|
| 666 | 664 |
'id' : group.idgroup, |
| 667 | 665 |
'name' : group.name, |
| vigigraph/tests/functional/test_host_selection_form.py | ||
|---|---|---|
| 210 | 210 |
hostgroup2 = DBSession.query(SupItemGroup).filter( |
| 211 | 211 |
SupItemGroup.name == u'hg2').first() |
| 212 | 212 |
|
| 213 |
# Récupération de l'hôte 'host1' dans la base de données |
|
| 214 |
host1 = DBSession.query(Host).filter( |
|
| 215 |
Host.name == u'host1').first() |
|
| 216 |
|
|
| 213 | 217 |
# Récupération des groupes d'hôtes |
| 214 | 218 |
# accessibles à l'utilisateur 'manager' |
| 215 | 219 |
response = self.app.post( |
| ... | ... | |
| 220 | 224 |
# On s'assure que la liste de groupes d'hôtes retournée |
| 221 | 225 |
# contient bien 'No subgroup', 'hg1', et 'hg2' |
| 222 | 226 |
self.assertEqual( |
| 223 |
json, {"items": [
|
|
| 224 |
['No subgroup', unicode(mainhostgroup.idgroup)], |
|
| 225 |
[hostgroup1.name, unicode(hostgroup1.idgroup)], |
|
| 226 |
[hostgroup2.name, unicode(hostgroup2.idgroup)], |
|
| 227 |
]} |
|
| 227 |
json, {
|
|
| 228 |
'leaves': [ |
|
| 229 |
{'id': host1.idhost, 'name': host1.name}
|
|
| 230 |
], |
|
| 231 |
'groups': [ |
|
| 232 |
{'id': hostgroup1.idgroup, 'name': hostgroup1.name},
|
|
| 233 |
{'id': hostgroup2.idgroup, 'name': hostgroup2.name},
|
|
| 234 |
] |
|
| 235 |
} |
|
| 228 | 236 |
) |
| 229 | 237 |
|
| 230 | 238 |
# Récupération des groupes d'hôtes |
| ... | ... | |
| 237 | 245 |
# On s'assure que la liste de groupes d'hôtes retournée |
| 238 | 246 |
# contient bien 'No subgroup', 'hg1', et 'hg2' |
| 239 | 247 |
self.assertEqual( |
| 240 |
json, {"items": [
|
|
| 241 |
['No subgroup', unicode(mainhostgroup.idgroup)], |
|
| 242 |
[hostgroup1.name, unicode(hostgroup1.idgroup)], |
|
| 243 |
[hostgroup2.name, unicode(hostgroup2.idgroup)], |
|
| 244 |
]} |
|
| 248 |
json, {
|
|
| 249 |
'leaves': [ |
|
| 250 |
{'id': host1.idhost, 'name': host1.name}
|
|
| 251 |
], |
|
| 252 |
'groups': [ |
|
| 253 |
{'id': hostgroup1.idgroup, 'name': hostgroup1.name},
|
|
| 254 |
{'id': hostgroup2.idgroup, 'name': hostgroup2.name},
|
|
| 255 |
] |
|
| 256 |
} |
|
| 245 | 257 |
) |
| 246 | 258 |
|
| 247 | 259 |
# Récupération des groupes d'hôtes |
| ... | ... | |
| 254 | 266 |
# On s'assure que la liste de groupes |
| 255 | 267 |
# d'hôtes retournée contient bien 'hg1' |
| 256 | 268 |
self.assertEqual( |
| 257 |
json, {"items": [
|
|
| 258 |
[hostgroup1.name, unicode(hostgroup1.idgroup)] |
|
| 259 |
]} |
|
| 269 |
json, {
|
|
| 270 |
'leaves': [], |
|
| 271 |
'groups': [ |
|
| 272 |
{'id': hostgroup1.idgroup, 'name': hostgroup1.name},
|
|
| 273 |
] |
|
| 274 |
} |
|
| 260 | 275 |
) |
| 261 | 276 |
|
| 262 | 277 |
def test_get_host_groups_when_not_allowed(self): |
| ... | ... | |
| 308 | 323 |
}, extra_environ={'REMOTE_USER': 'manager'})
|
| 309 | 324 |
json = response.json |
| 310 | 325 |
|
| 311 |
# On s'assure que la liste de groupes d'hôtes |
|
| 312 |
# retournée contient uniquement 'No subgroups' |
|
| 326 |
# On s'assure que la liste de groupes d'hôtes retournée est bien vide |
|
| 313 | 327 |
self.assertEqual( |
| 314 |
json, {"items": [['No subgroup', '6666666']]}
|
|
| 328 |
json, {'leaves': [], 'groups': []}
|
|
| 315 | 329 |
) |
| 316 | 330 |
|
| 317 | 331 |
##### Troisième onglet déroulant du formulaire ##### |
| ... | ... | |
| 387 | 401 |
'leaves': [{'id': host1.idhost, 'name': host1.name}],
|
| 388 | 402 |
'groups': [ |
| 389 | 403 |
{'id': hostgroup1.idgroup, 'name': hostgroup1.name},
|
| 404 |
{'id': hostgroup2.idgroup, 'name': hostgroup2.name},
|
|
| 390 | 405 |
] |
| 391 | 406 |
} |
| 392 | 407 |
) |
Also available in: Unified diff