Project

General

Profile

Revision 47acbffb

ID47acbffb73e87fe6d862fb141f85ac6fef374a5b
Parent 23bfcb80
Child a2a22ade

Added by Francois POIROTTE over 14 years ago

Correction des tests unitaires.
Mise à jour des traductions.
Quelques corrections mineures.

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

View differences:

vigiboard/tests/functional/test_vigiboardrequest.py
38 38
        manage_perm = Permission.by_permission_name(u'manage')
39 39
        edit_perm = Permission.by_permission_name(u'edit')
40 40

  
41
        manage_perm.groups.append(hostmanagers)
42
        edit_perm.groups.append(hosteditors)
41
        hostmanagers.permissions.append(manage_perm)
42
        hosteditors.permissions.append(edit_perm)
43 43
        DBSession.flush()
44 44

  
45 45
        # Les dépendances des évènements
......
66 66

  
67 67
        # Table de jointure entre les hôtes/services et les groupes
68 68
        DBSession.add(HostGroup(hostname = u"monhost",
69
            groupname = u"hostmanagers"))
69
            idgroup=hostmanagers.idgroup))
70 70
        DBSession.add(HostGroup(hostname = u"monhostuser",
71
            groupname = u"hosteditors"))
71
            idgroup=hosteditors.idgroup))
72 72
        DBSession.add(ServiceGroup(servicename = u"monservice",
73
            groupname = u"hostmanagers"))
73
            idgroup=hostmanagers.idgroup))
74 74
        DBSession.add(ServiceGroup(servicename = u"monserviceuser",
75
            groupname = u"hosteditors"))
75
            idgroup=hosteditors.idgroup))
76 76
        DBSession.flush()
77 77

  
78 78
        # Les évènements eux-mêmes
......
99 99

  
100 100
        # Les historiques
101 101
        DBSession.add(EventHistory(type_action = u'Nagios update state',
102
            idevent = event1.idevent))
102
            idevent=event1.idevent, timestamp=datetime.now()))
103 103
        DBSession.add(EventHistory(type_action = u'Acknowlegement change state',
104
            idevent = event1.idevent))
104
            idevent=event1.idevent, timestamp=datetime.now()))
105 105
        DBSession.add(EventHistory(type_action = u'Nagios update state',
106
            idevent = event2.idevent))
106
            idevent=event2.idevent, timestamp=datetime.now()))
107 107
        DBSession.add(EventHistory(type_action = u'Acknowlegement change state',
108
            idevent = event2.idevent))
108
            idevent=event2.idevent, timestamp=datetime.now()))
109 109
        DBSession.add(EventHistory(type_action = u'Nagios update state',
110
            idevent = event3.idevent))
110
            idevent=event3.idevent, timestamp=datetime.now()))
111 111
        DBSession.add(EventHistory(type_action = u'Acknowlegement change state',
112
            idevent = event3.idevent))
112
            idevent=event3.idevent, timestamp=datetime.now()))
113 113
        DBSession.add(EventHistory(type_action = u'Nagios update state',
114
            idevent = event4.idevent))
114
            idevent=event4.idevent, timestamp=datetime.now()))
115 115
        DBSession.add(EventHistory(type_action = u'Acknowlegement change state',
116
            idevent = event4.idevent))
116
            idevent=event4.idevent, timestamp=datetime.now()))
117 117
        DBSession.flush()
118 118

  
119 119
        # Les évènements corrélés
......
123 123
            'status': u'None',
124 124
        }
125 125
        self.aggregate1 = EventsAggregate(
126
            idaggregate=42,
127 126
            idcause=event1.idevent, **aggregate_template)
128 127
        self.aggregate2 = EventsAggregate(
129
            idaggregate=43,
130 128
            idcause=event4.idevent, **aggregate_template)
131 129

  
132 130
        self.aggregate1.events.append(event1)
......
138 136
        DBSession.flush()
139 137
        transaction.commit()
140 138

  
141

  
142 139
    def tearDown(self):
143 140
        # This operation is only necessary for DBMS which are
144 141
        # really strict about table locks, such as PostgreSQL.
145 142
        # For our tests, we use an (in-memory) SQLite database,
146 143
        # so we're unaffected. This is done only for completeness.
147
        DBSession.delete(self.aggregate1)
148
        DBSession.delete(self.aggregate1)
149
        DBSession.flush()
150
        transaction.commit()
151 144
        TestController.tearDown(self)
152 145

  
153 146

  
......
173 166
        assert_true(num_rows == 1, msg = "1 historique devrait " +
174 167
                "etre disponible pour l'utilisateur 'editor' mais il " +
175 168
                "y en a %d" % num_rows)
169

  
176 170
        vigi_req.format_events(0, 10)
177 171
        vigi_req.format_history()
172
        print vigi_req.events
178 173
        assert_true(len(vigi_req.events) == 1 + 1,
179 174
                msg = "1 evenement devrait etre disponible pour " +
180 175
                        "l'utilisateur 'editor' mais il y en a %d" %
181
                        len(vigi_req.events))
176
                        (len(vigi_req.events) - 1))
182 177
        assert_true(vigi_req.events[1][6][0][0] != 'Error', 
183
                msg = "Probleme d'execution des plugins ou de " +
178
                    msg = "Probleme d'execution des plugins ou de " +
184 179
                        "formatage des evenements") 
185 180

  
186 181
        # On recommence les tests précédents avec l'utilisateur
......
202 197
        assert_true(len(vigi_req.events) == 2 + 1, 
203 198
                msg = "2 evenements devraient être disponibles pour " +
204 199
                        "l'utilisateur 'manager' mais il y en a %d" %
205
                        len(vigi_req.events))
200
                        (len(vigi_req.events) - 1))
206 201
        assert_true(vigi_req.events[1][6][0][0] != 'Error', 
207 202
                msg = "Probleme d'execution des plugins")
208 203

  

Also available in: Unified diff