Project

General

Profile

Revision 6f6efdcd

ID6f6efdcd325be1f197f3f271ffeef4b2bc0a4560
Parent 88cac5bb
Child 0bd9c069

Added by Francois POIROTTE about 13 years ago

Fusion du travail fait dans la branche 'nested_sets' vers le trunk.

git-svn-id: https://vigilo-dev.si.c-s.fr/svn@6116 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 SupItemGroup, Host, Permission, \
12
from vigilo.models.tables import Host, Permission, \
13 13
                                    Event, CorrEvent, StateName, \
14 14
                                    User, UserGroup, DataPermission
15
from vigilo.models.demo.functions import *
15 16

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

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

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

  

Also available in: Unified diff