Skip to content

Commit 901e6e2

Browse files
committed
Adapt tests to changes of Tapyr
1 parent d69dbcd commit 901e6e2

File tree

3 files changed

+112
-45
lines changed

3 files changed

+112
-45
lines changed

_CNDB/_OMP/__test__/Antenna.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# Copyright (C) 2012-2015 Mag. Christian Tanzer All rights reserved
2+
# Copyright (C) 2012-2016 Mag. Christian Tanzer All rights reserved
33
# Glasauergasse 32, A--1130 Wien, Austria. [email protected]
44
# #*** <License> ************************************************************#
55
# This module is part of the package CNDB.OMP.__test__.
@@ -29,7 +29,7 @@
2929
from __future__ import absolute_import, division, print_function, unicode_literals
3030

3131
from _CNDB._OMP.__test__.model import *
32-
from datetime import datetime
32+
from datetime import datetime
3333

3434
_test_code = """
3535
>>> scope = Scaffold.scope (%(p1)s, %(n1)s) # doctest:+ELLIPSIS
@@ -122,6 +122,9 @@
122122
>>> b.my_node
123123
CNDB.Node ('nogps')
124124
125+
>>> b.my_node.manager is b.my_node.owner
126+
True
127+
125128
>>> CNDB.Antenna.query (Q.interface == wl).count ()
126129
1
127130
>>> CNDB.Antenna.query (Q.my_node.manager == mgr).count ()

_CNDB/_OMP/__test__/IP_Network.py

+59-7
Original file line numberDiff line numberDiff line change
@@ -951,34 +951,34 @@
951951
<pool.desc.AQ [Attr.Type.Querier String]> -----
952952
<pool.owner.AQ [Attr.Type.Querier Id_Entity]> PAP.Subject
953953
<pool.pool.AQ [Attr.Type.Querier Id_Entity]> CNDB.IP4_Network
954-
<pool.expiration_date.AQ [Attr.Type.Querier Ckd]> -----
954+
<pool.expiration_date.AQ [Attr.Type.Querier Ckd]> expiration_date__277__type_desc
955955
<pool.has_children.AQ [Attr.Type.Querier Boolean]> -----
956956
<pool.is_free.AQ [Attr.Type.Querier Boolean]> -----
957957
<pool.parent.AQ [Attr.Type.Querier Id_Entity]> CNDB.IP4_Network
958958
<creation.AQ [Attr.Type.Querier Rev_Ref]> MOM.MD_Change
959-
<creation.c_time.AQ [Attr.Type.Querier Ckd]> -----
959+
<creation.c_time.AQ [Attr.Type.Querier Ckd]> c_time__126__type_desc
960960
<creation.c_user.AQ [Attr.Type.Querier Id_Entity]> MOM.Id_Entity
961961
<creation.kind.AQ [Attr.Type.Querier String]> -----
962-
<creation.time.AQ [Attr.Type.Querier Ckd]> -----
962+
<creation.time.AQ [Attr.Type.Querier Ckd]> time__133__type_desc
963963
<creation.user.AQ [Attr.Type.Querier Id_Entity]> MOM.Id_Entity
964964
<last_change.AQ [Attr.Type.Querier Rev_Ref]> MOM.MD_Change
965-
<last_change.c_time.AQ [Attr.Type.Querier Ckd]> -----
965+
<last_change.c_time.AQ [Attr.Type.Querier Ckd]> c_time__126__type_desc
966966
<last_change.c_user.AQ [Attr.Type.Querier Id_Entity]> MOM.Id_Entity
967967
<last_change.kind.AQ [Attr.Type.Querier String]> -----
968-
<last_change.time.AQ [Attr.Type.Querier Ckd]> -----
968+
<last_change.time.AQ [Attr.Type.Querier Ckd]> time__133__type_desc
969969
<last_change.user.AQ [Attr.Type.Querier Id_Entity]> MOM.Id_Entity
970970
<last_cid.AQ [Attr.Type.Querier Ckd]> -----
971971
<pid.AQ [Attr.Type.Querier Ckd]> -----
972972
<type_name.AQ [Attr.Type.Querier String]> -----
973-
<expiration_date.AQ [Attr.Type.Querier Ckd]> -----
973+
<expiration_date.AQ [Attr.Type.Querier Ckd]> expiration_date__277__type_desc
974974
<has_children.AQ [Attr.Type.Querier Boolean]> -----
975975
<is_free.AQ [Attr.Type.Querier Boolean]> -----
976976
<parent.AQ [Attr.Type.Querier Id_Entity]> CNDB.IP4_Network
977977
<parent.net_address.AQ [Attr.Type.Querier Ckd]> -----
978978
<parent.desc.AQ [Attr.Type.Querier String]> -----
979979
<parent.owner.AQ [Attr.Type.Querier Id_Entity]> PAP.Subject
980980
<parent.pool.AQ [Attr.Type.Querier Id_Entity]> CNDB.IP4_Network
981-
<parent.expiration_date.AQ [Attr.Type.Querier Ckd]> -----
981+
<parent.expiration_date.AQ [Attr.Type.Querier Ckd]> expiration_date__277__type_desc
982982
<parent.has_children.AQ [Attr.Type.Querier Boolean]> -----
983983
<parent.is_free.AQ [Attr.Type.Querier Boolean]> -----
984984
<parent.parent.AQ [Attr.Type.Querier Id_Entity]> CNDB.IP4_Network
@@ -8155,6 +8155,32 @@
81558155
( Record
81568156
( AQ = <lifetime.start.AQ [Attr.Type.Querier Date]>
81578157
, attr = Date `start`
8158+
, attrs =
8159+
[ Record
8160+
( attr = Int `day`
8161+
, full_name = 'lifetime.start.day'
8162+
, id = 'lifetime__start__day'
8163+
, name = 'day'
8164+
, sig_key = 0
8165+
, ui_name = 'Lifetime/Start/Day'
8166+
)
8167+
, Record
8168+
( attr = Int `month`
8169+
, full_name = 'lifetime.start.month'
8170+
, id = 'lifetime__start__month'
8171+
, name = 'month'
8172+
, sig_key = 0
8173+
, ui_name = 'Lifetime/Start/Month'
8174+
)
8175+
, Record
8176+
( attr = Int `year`
8177+
, full_name = 'lifetime.start.year'
8178+
, id = 'lifetime__start__year'
8179+
, name = 'year'
8180+
, sig_key = 0
8181+
, ui_name = 'Lifetime/Start/Year'
8182+
)
8183+
]
81588184
, edit = None
81598185
, full_name = 'lifetime.start'
81608186
, id = 'lifetime__start___AC'
@@ -8171,6 +8197,32 @@
81718197
, Record
81728198
( AQ = <lifetime.finish.AQ [Attr.Type.Querier Date]>
81738199
, attr = Date `finish`
8200+
, attrs =
8201+
[ Record
8202+
( attr = Int `day`
8203+
, full_name = 'lifetime.finish.day'
8204+
, id = 'lifetime__finish__day'
8205+
, name = 'day'
8206+
, sig_key = 0
8207+
, ui_name = 'Lifetime/Finish/Day'
8208+
)
8209+
, Record
8210+
( attr = Int `month`
8211+
, full_name = 'lifetime.finish.month'
8212+
, id = 'lifetime__finish__month'
8213+
, name = 'month'
8214+
, sig_key = 0
8215+
, ui_name = 'Lifetime/Finish/Month'
8216+
)
8217+
, Record
8218+
( attr = Int `year`
8219+
, full_name = 'lifetime.finish.year'
8220+
, id = 'lifetime__finish__year'
8221+
, name = 'year'
8222+
, sig_key = 0
8223+
, ui_name = 'Lifetime/Finish/Year'
8224+
)
8225+
]
81748226
, edit = None
81758227
, full_name = 'lifetime.finish'
81768228
, id = 'lifetime__finish___AC'

0 commit comments

Comments
 (0)