Revision 8c93d88b
Correction des tests.
Correction de la fonction get_last_modification_timestamp pour le cas où la table CorrEvent est vide.
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@1668 b22e2e97-25c9-44ff-b637-2e5ceca36478
vigiboard/controllers/root.py | ||
---|---|---|
543 | 543 |
func.max(EventHistory.timestamp), |
544 | 544 |
).filter(EventHistory.idevent.in_(event_id_list) |
545 | 545 |
).scalar() |
546 |
|
|
547 |
return last_modification_timestamp |
|
546 |
|
|
547 |
if last_modification_timestamp: |
|
548 |
return last_modification_timestamp |
|
549 |
return datetime.now() |
|
548 | 550 |
|
549 | 551 |
def date_to_timestamp(date): |
550 | 552 |
""" |
vigiboard/tests/functional/test_vigiboardrequest.py | ||
---|---|---|
189 | 189 |
|
190 | 190 |
# Derrière, VigiboardRequest doit charger le plugin de tests tout seul |
191 | 191 |
tg.config['vigiboard_plugins'] = [['tests', 'MonPlugin']] |
192 |
vigi_req = VigiboardRequest(User.by_user_name(u'editor'), 'fr')
|
|
192 |
vigi_req = VigiboardRequest(User.by_user_name(u'editor')) |
|
193 | 193 |
|
194 | 194 |
# On effectue les tests suivants : |
195 | 195 |
# le nombre de lignes (historique et événements) doivent |
... | ... | |
218 | 218 |
response = self.app.get('/', extra_environ=environ) |
219 | 219 |
tg.request = response.request |
220 | 220 |
|
221 |
vigi_req = VigiboardRequest(User.by_user_name(u'manager'), 'fr')
|
|
221 |
vigi_req = VigiboardRequest(User.by_user_name(u'manager')) |
|
222 | 222 |
vigi_req.add_plugin(MonPlugin) |
223 | 223 |
|
224 | 224 |
num_rows = vigi_req.num_rows() |
Also available in: Unified diff