aboutsummaryrefslogtreecommitdiffstats
path: root/selftest
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-05-07 01:16:07 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-05-08 12:50:42 +0200
commitcccbe5987db2ae97f766ae018c45c4fc0f7b3c26 (patch)
tree06d3489efeca121880edc8cf4a5b995603b15557 /selftest
parent56b3d7e685b49e412362184e00d4cacc5ac045bd (diff)
improve logging for resource allocation
Log on level 'log', more clearly show whether it's for reservation or actual use, show the origin that is asking for them. Change-Id: I3b78c7bdcaec90943900343c878099160f8d2f64
Diffstat (limited to 'selftest')
-rw-r--r--selftest/resource_test.ok16
-rw-r--r--selftest/suite_test.ok15
2 files changed, 17 insertions, 14 deletions
diff --git a/selftest/resource_test.ok b/selftest/resource_test.ok
index 764dfc1..db6a8bf 100644
--- a/selftest/resource_test.ok
+++ b/selftest/resource_test.ok
@@ -155,15 +155,15 @@ cnf -: DBG: Found path state_dir as [PATH]/selftest/conf/test_work/state_dir
*** end: all resources
- request some resources
---- (want='arfcn'): DBG: Looking for 2 x arfcn , candidates: 10
---- (want='arfcn'): DBG: Picked - _hash: e620569450f8259b3f0212ec19c285dd07df063c
+--- testowner: Reserving 2 x arfcn (candidates: 10)
+--- testowner: DBG: Picked - _hash: e620569450f8259b3f0212ec19c285dd07df063c
arfcn: '512'
band: GSM-1800
- _hash: 022621e513c5a5bf33b77430a1e9c886be676fa1
arfcn: '514'
band: GSM-1800
---- (want='bts'): DBG: Looking for 2 x bts , candidates: 3
---- (want='bts'): DBG: Picked - _hash: 07d9c8aaa940b674efcbbabdd69f58a6ce4e94f9
+--- testowner: Reserving 2 x bts (candidates: 3)
+--- testowner: DBG: Picked - _hash: 07d9c8aaa940b674efcbbabdd69f58a6ce4e94f9
addr: 10.42.42.114
band: GSM-1800
ipa_unit_id: '1'
@@ -177,8 +177,8 @@ cnf -: DBG: Found path state_dir as [PATH]/selftest/conf/test_work/state_dir
trx_list:
- hw_addr: 00:0c:90:32:b5:8a
type: oct
---- (want='modem'): DBG: Looking for 2 x modem , candidates: 16
---- (want='modem'): DBG: Picked - _hash: 19c69e45aa090fb511446bd00797690aa82ff52f
+--- testowner: Reserving 2 x modem (candidates: 16)
+--- testowner: DBG: Picked - _hash: 19c69e45aa090fb511446bd00797690aa82ff52f
imsi: '901700000007801'
ki: D620F48487B1B782DA55DF6717F08FF9
label: m7801
@@ -188,8 +188,8 @@ cnf -: DBG: Found path state_dir as [PATH]/selftest/conf/test_work/state_dir
ki: 47FDB2D55CE6A10A85ABDAD034A5B7B3
label: m7802
path: /wavecom_1
---- (want='nitb_iface'): DBG: Looking for 1 x nitb_iface , candidates: 3
---- (want='nitb_iface'): DBG: Picked - _hash: cde1debf28f07f94f92c761b4b7c6bf35785ced4
+--- testowner: Reserving 1 x nitb_iface (candidates: 3)
+--- testowner: DBG: Picked - _hash: cde1debf28f07f94f92c761b4b7c6bf35785ced4
addr: 10.42.42.1
~~~ currently reserved:
arfcn:
diff --git a/selftest/suite_test.ok b/selftest/suite_test.ok
index 0321b26..b20bdc5 100644
--- a/selftest/suite_test.ok
+++ b/selftest/suite_test.ok
@@ -28,15 +28,16 @@ tst test_suite: Suite run start
tst test_suite: reserving resources...
tst test_suite: DBG: {combining='resources'} [test_suite↪test_suite]
tst test_suite: DBG: {definition_conf={bts=[{'times': '1'}], modem=[{'times': '2'}], nitb_iface=[{'times': '1'}]}} [test_suite↪(combining_scenarios='resources')↪test_suite]
---- (want='bts'): DBG: Looking for 1 x bts , candidates: 3
---- (want='bts'): DBG: Picked - _hash: 07d9c8aaa940b674efcbbabdd69f58a6ce4e94f9
+tst test_suite: Reserving 1 x bts (candidates: 3) [test_suite↪test_suite]
+tst test_suite: DBG: Picked - _hash: 07d9c8aaa940b674efcbbabdd69f58a6ce4e94f9
addr: 10.42.42.114
band: GSM-1800
ipa_unit_id: '1'
label: sysmoBTS 1002
type: sysmo
---- (want='modem'): DBG: Looking for 2 x modem , candidates: 16
---- (want='modem'): DBG: Picked - _hash: 19c69e45aa090fb511446bd00797690aa82ff52f
+ [test_suite↪test_suite]
+tst test_suite: Reserving 2 x modem (candidates: 16) [test_suite↪test_suite]
+tst test_suite: DBG: Picked - _hash: 19c69e45aa090fb511446bd00797690aa82ff52f
imsi: '901700000007801'
ki: D620F48487B1B782DA55DF6717F08FF9
label: m7801
@@ -46,9 +47,11 @@ tst test_suite: DBG: {definition_conf={bts=[{'times': '1'}], modem=[{'times': '2
ki: 47FDB2D55CE6A10A85ABDAD034A5B7B3
label: m7802
path: /wavecom_1
---- (want='nitb_iface'): DBG: Looking for 1 x nitb_iface , candidates: 3
---- (want='nitb_iface'): DBG: Picked - _hash: cde1debf28f07f94f92c761b4b7c6bf35785ced4
+ [test_suite↪test_suite]
+tst test_suite: Reserving 1 x nitb_iface (candidates: 3) [test_suite↪test_suite]
+tst test_suite: DBG: Picked - _hash: cde1debf28f07f94f92c761b4b7c6bf35785ced4
addr: 10.42.42.1
+ [test_suite↪test_suite]
tst hello_world.py: START [test_suite↪hello_world.py]
tst hello_world.py:3: hello world [test_suite↪hello_world.py:3]
tst hello_world.py:4: I am 'test_suite' / 'hello_world.py:4' [test_suite↪hello_world.py:4]