Project

General

Profile

Revision 4a214341

ID4a21434160832355dfa9c6a5ae435a909d08d438
Parent 1a1e8c17
Child fb8a459e

Added by Francois POIROTTE about 14 years ago

Correction tests unitaires (plus besoin de manipuler GroupHierarchy directement).

git-svn-id: https://vigilo-dev.si.c-s.fr/svn@3886 b22e2e97-25c9-44ff-b637-2e5ceca36478

View differences:

vigiboard/tests/functional/plugins/test_details_plugin.py
12 12
from vigilo.models.tables import SupItemGroup, User, UserGroup, \
13 13
                            Permission, DataPermission, StateName, \
14 14
                            LowLevelService, Event, CorrEvent, Host
15
from vigilo.models.tables.grouphierarchy import GroupHierarchy
16 15

  
17 16
def insert_deps(return_service):
18 17
    """
......
31 30
    hostgroup = SupItemGroup(name=u'foo')
32 31
    DBSession.add(hostgroup)
33 32

  
34
    DBSession.add(GroupHierarchy(
35
        parent=hostgroup,
36
        child=hostgroup,
37
        hops=0,
38
    ))
39

  
40 33
    host = Host(
41 34
        name=u'bar',
42 35
        checkhostcmd=u'',
......
57 50
    servicegroup = SupItemGroup(name=u'bar')
58 51
    DBSession.add(servicegroup)
59 52

  
60
    DBSession.add(GroupHierarchy(
61
        parent=servicegroup,
62
        child=servicegroup,
63
        hops=0,
64
    ))
65

  
66 53
    service = LowLevelService(
67 54
        host=host,
68 55
        command=u'',
vigiboard/tests/functional/plugins/test_plugin_hls.py
10 10
                            SupItemGroup, Host, HighLevelService, \
11 11
                            Event, CorrEvent, ImpactedPath, ImpactedHLS, \
12 12
                            User, UserGroup
13
from vigilo.models.tables.grouphierarchy import GroupHierarchy
14 13
from vigiboard.tests import TestController
15 14

  
16 15
def populate_DB():
......
21 20
    DBSession.add(hostmanagers)
22 21
    DBSession.flush()
23 22

  
24
    DBSession.add(GroupHierarchy(
25
        parent=hostmanagers,
26
        child=hostmanagers,
27
        hops=0,
28
    ))
29

  
30 23
    # On lui octroie les permissions
31 24
    usergroup = UserGroup.by_group_name(u'users_with_access')
32 25
    DBSession.add(DataPermission(
vigiboard/tests/functional/test_correvents_table.py
12 12
from vigilo.models.tables import Event, CorrEvent, DataPermission, \
13 13
                            Permission, StateName, Host, SupItemGroup, \
14 14
                            LowLevelService, User, UserGroup, Permission
15
from vigilo.models.tables.grouphierarchy import GroupHierarchy
16 15
from vigiboard.tests import TestController
17 16

  
18 17
def populate_DB():
19 18
    """ Peuple la base de données. """
20 19
    # On ajoute les groupes et leurs dépendances
21
    hosteditors = SupItemGroup(name=u'editorsgroup')
22
    DBSession.add(hosteditors)
23 20
    hostmanagers = SupItemGroup(name=u'managersgroup')
24 21
    DBSession.add(hostmanagers)
25
    DBSession.flush()
26

  
27
    DBSession.add(GroupHierarchy(
28
        parent=hosteditors,
29
        child=hosteditors,
30
        hops=0,
31
    ))
32
    DBSession.add(GroupHierarchy(
33
        parent=hostmanagers,
34
        child=hostmanagers,
35
        hops=0,
36
    ))
37
    DBSession.add(GroupHierarchy(
38
        parent=hostmanagers,
39
        child=hosteditors,
40
        hops=1,
41
    ))
22
    hosteditors = SupItemGroup(name=u'editorsgroup', parent=hostmanagers)
23
    DBSession.add(hosteditors)
42 24
    DBSession.flush()
43 25

  
44 26
    usergroup = UserGroup.by_group_name(u'users_with_access')
vigiboard/tests/functional/test_history_table.py
15 15
                            SupItemGroup, LowLevelService, \
16 16
                            Permission, DataPermission, User, \
17 17
                            UserGroup
18
from vigilo.models.tables.grouphierarchy import GroupHierarchy
19 18
from vigiboard.tests import TestController
20 19

  
21 20
def populate_DB():
......
25 24
    DBSession.add(supitemmanagers)
26 25
    DBSession.flush()
27 26

  
28
    DBSession.add(GroupHierarchy(
29
        parent=supitemmanagers,
30
        child=supitemmanagers,
31
        hops=0,
32
    ))
33

  
34 27
    usergroup = UserGroup.by_group_name(u'users_with_access')
35 28
    DBSession.add(DataPermission(
36 29
        group=supitemmanagers,
vigiboard/tests/functional/test_raw_events_table.py
12 12
from vigilo.models.tables import Event, EventHistory, CorrEvent, User, \
13 13
                            Permission, StateName, Host, UserGroup, \
14 14
                            LowLevelService, SupItemGroup, DataPermission
15
from vigilo.models.tables.grouphierarchy import GroupHierarchy
16 15
from vigiboard.tests import TestController
17 16

  
18 17
def populate_accounts():
......
54 53
    DBSession.add(supitemmanagers)
55 54
    DBSession.flush()
56 55

  
57
    DBSession.add(GroupHierarchy(
58
        parent=supitemmanagers,
59
        child=supitemmanagers,
60
        hops=0,
61
    ))
62
    DBSession.flush()
63

  
64 56
    usergroup = UserGroup.by_group_name(u'users_with_access')
65 57
    DBSession.add(DataPermission(
66 58
        group=supitemmanagers,
vigiboard/tests/functional/test_root.py
19 19
from vigilo.models.tables import Event, EventHistory, CorrEvent, User, \
20 20
                            Permission, StateName, Host, UserGroup, \
21 21
                            SupItemGroup, LowLevelService, DataPermission
22
from vigilo.models.tables.grouphierarchy import GroupHierarchy
23 22
from vigiboard.tests import TestController
24 23

  
25 24
def populate_DB():
......
29 28
    DBSession.add(supitemmanagers)
30 29
    DBSession.flush()
31 30

  
32
    DBSession.add(GroupHierarchy(
33
        parent=supitemmanagers,
34
        child=supitemmanagers,
35
        hops=0,
36
    ))
37
    DBSession.flush()
38

  
39 31
    usergroup = UserGroup.by_group_name(u'users_with_access')
40 32
    DBSession.add(DataPermission(
41 33
        group=supitemmanagers,
vigiboard/tests/functional/test_search_form_host.py
11 11
from vigilo.models.tables import SupItemGroup, Host, Permission, \
12 12
                                    Event, CorrEvent, StateName, \
13 13
                                    User, UserGroup, DataPermission
14
from vigilo.models.tables.grouphierarchy import GroupHierarchy
15 14

  
16 15
def insert_deps():
17 16
    """Insère les dépendances nécessaires aux tests."""
......
23 22
    DBSession.add(hostgroup)
24 23
    DBSession.flush()
25 24

  
26
    DBSession.add(GroupHierarchy(
27
        parent=hostgroup,
28
        child=hostgroup,
29
        hops=0,
30
    ))
31
    DBSession.flush()
32

  
33 25
    host = Host(
34 26
        name=u'bar',
35 27
        checkhostcmd=u'',
vigiboard/tests/functional/test_search_form_misc.py
12 12
from vigilo.models.tables import SupItemGroup, Host, Permission, \
13 13
                                    Event, CorrEvent, StateName, \
14 14
                                    User, UserGroup, DataPermission
15
from vigilo.models.tables.grouphierarchy import GroupHierarchy
16 15

  
17 16
def insert_deps():
18 17
    """Insère les dépendances nécessaires aux tests."""
......
37 36
    DBSession.add(hostgroup)
38 37
    DBSession.flush()
39 38

  
40
    DBSession.add(GroupHierarchy(
41
        parent=hostgroup,
42
        child=hostgroup,
43
        hops=0,
44
    ))
45
    DBSession.flush()
46

  
47 39
    event = Event(
48 40
        supitem=host,
49 41
        timestamp=timestamp,
vigiboard/tests/functional/test_search_form_service.py
12 12
                                    StateName, LowLevelService, \
13 13
                                    Event, CorrEvent, User, UserGroup, \
14 14
                                    DataPermission
15
from vigilo.models.tables.grouphierarchy import GroupHierarchy
16 15

  
17 16
def insert_deps():
18 17
    """Insère les dépendances nécessaires aux tests."""
......
21 20
    hostgroup = SupItemGroup(name=u'foo')
22 21
    DBSession.add(hostgroup)
23 22

  
24
    DBSession.add(GroupHierarchy(
25
        parent=hostgroup,
26
        child=hostgroup,
27
        hops=0,
28
    ))
29
    DBSession.flush()
30

  
31 23
    host = Host(
32 24
        name=u'bar',
33 25
        checkhostcmd=u'',
......
47 39

  
48 40
    servicegroup = SupItemGroup(name=u'bar')
49 41
    DBSession.add(servicegroup)
50

  
51
    DBSession.add(GroupHierarchy(
52
        parent=servicegroup,
53
        child=servicegroup,
54
        hops=0,
55
    ))
56 42
    DBSession.flush()
57 43

  
58 44
    service = LowLevelService(
vigiboard/tests/functional/test_search_form_supitemgroup.py
11 11
from vigilo.models.tables import SupItemGroup, Host, Permission, StateName, \
12 12
                                    Event, CorrEvent, User, UserGroup, \
13 13
                                    DataPermission
14
from vigilo.models.tables.grouphierarchy import GroupHierarchy
15 14

  
16 15
def insert_deps():
17 16
    """Insère les dépendances nécessaires aux tests."""
......
23 22
    DBSession.add(supitemgroup)
24 23
    DBSession.flush()
25 24

  
26
    DBSession.add(GroupHierarchy(
27
        parent=supitemgroup,
28
        child=supitemgroup,
29
        hops=0,
30
    ))
31
    DBSession.flush()
32

  
33 25
    host = Host(
34 26
        name=u'bar',
35 27
        checkhostcmd=u'',

Also available in: Unified diff