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_service.py
8 8

  
9 9
from vigiboard.tests import TestController
10 10
from vigilo.models.session import DBSession
11
from vigilo.models.tables import SupItemGroup, Host, Permission, \
11
from vigilo.models.tables import Host, Permission, \
12 12
                                    StateName, LowLevelService, \
13 13
                                    Event, CorrEvent, User, UserGroup, \
14 14
                                    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."""
18 19
    timestamp = datetime.now()
19 20

  
20
    hostgroup = SupItemGroup(name=u'foo')
21
    DBSession.add(hostgroup)
21
    hostgroup = add_supitemgroup(name=u'foo')
22 22

  
23 23
    host = Host(
24 24
        name=u'bar',
......
37 37
    hostgroup.supitems.append(host)
38 38
    DBSession.flush()
39 39

  
40
    servicegroup = SupItemGroup(name=u'bar')
40
    servicegroup = add_supitemgroup(name=u'bar')
41 41
    DBSession.add(servicegroup)
42 42
    DBSession.flush()
43 43

  
......
204 204
        cols = response.lxml.xpath('//table[@class="vigitable"]/tbody/tr/td')
205 205
        print "There are %d columns in the result set" % len(cols)
206 206
        assert_equal(len(cols), 1)
207

  

Also available in: Unified diff