Project

General

Profile

Revision 0bd9c069

ID0bd9c06917b20932fbfd6f30384dd5018c50f3e6
Parent 6f6efdcd
Child 6707e733

Added by Francois POIROTTE about 13 years ago

Retrait des modifications liées à la fusion de la branche nested_sets du trunk (révisions r6116, r6121 et r6129).
Le nouveau mécanisme nécessite encore des ajustements pour être utilisable.

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

View differences:

vigiboard/tests/functional/test_search_form_misc.py
9 9

  
10 10
from vigiboard.tests import TestController
11 11
from vigilo.models.session import DBSession
12
from vigilo.models.tables import Host, Permission, \
12
from vigilo.models.tables import SupItemGroup, Host, Permission, \
13 13
                                    Event, CorrEvent, StateName, \
14 14
                                    User, UserGroup, DataPermission
15
from vigilo.models.demo.functions import *
16 15

  
17 16
def insert_deps():
18 17
    """Insère les dépendances nécessaires aux tests."""
......
32 31
    DBSession.add(host)
33 32
    DBSession.flush()
34 33

  
35
    hostgroup = add_supitemgroup(name=u'foo')
34
    hostgroup = SupItemGroup(name=u'foo')
36 35
    hostgroup.supitems.append(host)
36
    DBSession.add(hostgroup)
37
    DBSession.flush()
37 38

  
38 39
    event = Event(
39 40
        supitem=host,
......
160 161
        cols = response.lxml.xpath('//table[@class="vigitable"]/tbody/tr/td')
161 162
        print "There are %d columns in the result set" % len(cols)
162 163
        assert_true(len(cols) > 1)
164

  

Also available in: Unified diff