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/plugins/test_details_plugin.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, User, UserGroup, \
12
from vigilo.models.tables import User, UserGroup, \
13 13
                            Permission, DataPermission, StateName, \
14 14
                            LowLevelService, Event, CorrEvent, Host
15
from vigilo.models.demo.functions import *
15 16

  
16 17
def insert_deps(return_service):
17 18
    """
......
27 28
    """
28 29
    timestamp = datetime.now()
29 30

  
30
    hostgroup = SupItemGroup(name=u'foo')
31
    DBSession.add(hostgroup)
31
    hostgroup = add_supitemgroup(name=u'foo')
32 32

  
33 33
    host = Host(
34 34
        name=u'bar',
......
47 47
    hostgroup.supitems.append(host)
48 48
    DBSession.flush()
49 49

  
50
    servicegroup = SupItemGroup(name=u'bar')
51
    DBSession.add(servicegroup)
50
    servicegroup = add_supitemgroup(name=u'bar')
52 51

  
53 52
    service = LowLevelService(
54 53
        host=host,
......
235 234
                'idcorrevent': idcorrevent,
236 235
                'plugin_name': 'details',
237 236
            }, status=401)
238

  

Also available in: Unified diff