cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

db_sms_test: Remove libdbi expected driver load errors 

Newer versions of libdbi print to stderr unconditionally when trying to
load drivers from /usr/lib/dbd. This makes test output to change
depending on host/distro set up (installed modules).

Let's get those messages out to make it easier for people having tests
pass.

We swap stderr/stdout instead of mixing to avoud future possible race
conditions if both get content writen into them.

Change-Id: Iec78826d28435f464be22e81b3776a6ae8326d59
This commit is contained in:
Pau Espin 2019-06-04 11:29:46 +02:00 committed by pespin
parent f523f22899
commit 4474f35770
3 changed files with 77 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
tests/db_sms/db_sms_test.err
View File

@ -1,75 +0,0 @@
DDB DEBUG Init a new database
DDB DEBUG Init complete
DDB INFO Testing db_sms_store()...
DDB NOTICE test_db_sms_store('Regular MO SMS'): success, as expected
DDB NOTICE test_db_sms_store('Regular MT SMS'): success, as expected
DDB NOTICE test_db_sms_store('Complete TP-UD (160 septets, 7-bit encoding)'): success, as expected
DDB NOTICE test_db_sms_store('Complete TP-UD (140 octets, 8-bit encoding)'): success, as expected
DDB NOTICE test_db_sms_store('TP-UD buffer overflow (UDH-Length > UD-Length)'): success, as expected
DDB NOTICE test_db_sms_store('Truncated TP-UD (200 septets, 7-bit encoding)'): success, as expected
DDB NOTICE test_db_sms_store('Truncated TP-UD (255 octets, 8-bit encoding)'): success, as expected
DDB NOTICE test_db_sms_store('Same MSISDN #1'): success, as expected
DDB NOTICE test_db_sms_store('Same MSISDN #2'): success, as expected
DDB NOTICE test_db_sms_store('Expired SMS'): success, as expected
DDB NOTICE test_db_sms_store('Empty TP-UD'): success, as expected
DDB INFO Testing db_sms_get()...
DDB NOTICE test_db_sms_get('Regular MO SMS'): success, as expected
DDB NOTICE verify_sms('Regular MO SMS'): match
DDB NOTICE test_db_sms_get('Regular MT SMS'): success, as expected
DDB NOTICE verify_sms('Regular MT SMS'): match
DDB NOTICE test_db_sms_get('Complete TP-UD (160 septets, 7-bit encoding)'): success, as expected
DDB NOTICE verify_sms('Complete TP-UD (160 septets, 7-bit encoding)'): TP-User-Data mismatch
DDB NOTICE test_db_sms_get('Complete TP-UD (140 octets, 8-bit encoding)'): success, as expected
DDB NOTICE verify_sms('Complete TP-UD (140 octets, 8-bit encoding)'): TP-User-Data mismatch
DDB NOTICE test_db_sms_get('TP-UD buffer overflow (UDH-Length > UD-Length)'): success, as expected
DDB NOTICE verify_sms('TP-UD buffer overflow (UDH-Length > UD-Length)'): match
DDB NOTICE test_db_sms_get('Truncated TP-UD (200 septets, 7-bit encoding)'): success, as expected
DDB NOTICE verify_sms('Truncated TP-UD (200 septets, 7-bit encoding)'): TP-User-Data mismatch
DDB NOTICE test_db_sms_get('Truncated TP-UD (255 octets, 8-bit encoding)'): success, as expected
DDB NOTICE verify_sms('Truncated TP-UD (255 octets, 8-bit encoding)'): TP-User-Data mismatch
DDB NOTICE test_db_sms_get('Same MSISDN #1'): success, as expected
DDB NOTICE verify_sms('Same MSISDN #1'): match
DDB NOTICE test_db_sms_get('Same MSISDN #2'): success, as expected
DDB NOTICE verify_sms('Same MSISDN #2'): match
DDB NOTICE test_db_sms_get('Expired SMS'): success, as expected
DDB NOTICE verify_sms('Expired SMS'): match
DDB NOTICE test_db_sms_get('Empty TP-UD'): success, as expected
DDB NOTICE verify_sms('Empty TP-UD'): match
DDB INFO Testing db_sms_get_next_unsent() and db_sms_mark_delivered()...
DDB NOTICE db_sms_get_next_unsent(#1): found
DDB NOTICE verify_sms('Regular MO SMS'): match
DDB NOTICE db_sms_get_next_unsent(#2): found
DDB NOTICE verify_sms('Regular MT SMS'): match
DDB DEBUG Marking #1 as delivered: rc=0
DDB DEBUG Marking #2 as delivered: rc=0
DDB NOTICE db_sms_get_next_unsent(starting from #1): found
DDB NOTICE verify_sms('Complete TP-UD (160 septets, 7-bit encoding)'): TP-User-Data mismatch
DDB INFO Testing db_sms_delete_sent_message_by_id()...
DDB NOTICE db_sms_delete_sent_message_by_id(#1, sent): rc=0
DDB NOTICE db_sms_delete_sent_message_by_id(#3, not sent): rc=0
DDB INFO Testing db_sms_delete_by_msisdn()...
DDB NOTICE db_sms_delete_by_msisdn('72631'): rc=0
DDB INFO Testing db_sms_delete_oldest_expired_message()...
DDB NOTICE db_sms_delete_oldest_expired_message()
DDB INFO Expectations updated, retrieving all messages again
DDB INFO Testing db_sms_get()...
DDB NOTICE test_db_sms_get('Regular MO SMS'): failure, as expected
DDB NOTICE test_db_sms_get('Regular MT SMS'): success, as expected
DDB NOTICE verify_sms('Regular MT SMS'): match
DDB NOTICE test_db_sms_get('Complete TP-UD (160 septets, 7-bit encoding)'): success, as expected
DDB NOTICE verify_sms('Complete TP-UD (160 septets, 7-bit encoding)'): TP-User-Data mismatch
DDB NOTICE test_db_sms_get('Complete TP-UD (140 octets, 8-bit encoding)'): success, as expected
DDB NOTICE verify_sms('Complete TP-UD (140 octets, 8-bit encoding)'): TP-User-Data mismatch
DDB NOTICE test_db_sms_get('TP-UD buffer overflow (UDH-Length > UD-Length)'): success, as expected
DDB NOTICE verify_sms('TP-UD buffer overflow (UDH-Length > UD-Length)'): match
DDB NOTICE test_db_sms_get('Truncated TP-UD (200 septets, 7-bit encoding)'): success, as expected
DDB NOTICE verify_sms('Truncated TP-UD (200 septets, 7-bit encoding)'): TP-User-Data mismatch
DDB NOTICE test_db_sms_get('Truncated TP-UD (255 octets, 8-bit encoding)'): success, as expected
DDB NOTICE verify_sms('Truncated TP-UD (255 octets, 8-bit encoding)'): TP-User-Data mismatch
DDB NOTICE test_db_sms_get('Same MSISDN #1'): failure, as expected
DDB NOTICE test_db_sms_get('Same MSISDN #2'): failure, as expected
DDB NOTICE test_db_sms_get('Expired SMS'): unexpected result
DDB NOTICE verify_sms('Expired SMS'): match
DDB NOTICE test_db_sms_get('Empty TP-UD'): success, as expected
DDB NOTICE verify_sms('Empty TP-UD'): match
full talloc report on 'null_context' (total 0 bytes in 1 blocks)

75
tests/db_sms/db_sms_test.ok
View File

@ -0,0 +1,75 @@
DDB DEBUG Init a new database
DDB DEBUG Init complete
DDB INFO Testing db_sms_store()...
DDB NOTICE test_db_sms_store('Regular MO SMS'): success, as expected
DDB NOTICE test_db_sms_store('Regular MT SMS'): success, as expected
DDB NOTICE test_db_sms_store('Complete TP-UD (160 septets, 7-bit encoding)'): success, as expected
DDB NOTICE test_db_sms_store('Complete TP-UD (140 octets, 8-bit encoding)'): success, as expected
DDB NOTICE test_db_sms_store('TP-UD buffer overflow (UDH-Length > UD-Length)'): success, as expected
DDB NOTICE test_db_sms_store('Truncated TP-UD (200 septets, 7-bit encoding)'): success, as expected
DDB NOTICE test_db_sms_store('Truncated TP-UD (255 octets, 8-bit encoding)'): success, as expected
DDB NOTICE test_db_sms_store('Same MSISDN #1'): success, as expected
DDB NOTICE test_db_sms_store('Same MSISDN #2'): success, as expected
DDB NOTICE test_db_sms_store('Expired SMS'): success, as expected
DDB NOTICE test_db_sms_store('Empty TP-UD'): success, as expected
DDB INFO Testing db_sms_get()...
DDB NOTICE test_db_sms_get('Regular MO SMS'): success, as expected
DDB NOTICE verify_sms('Regular MO SMS'): match
DDB NOTICE test_db_sms_get('Regular MT SMS'): success, as expected
DDB NOTICE verify_sms('Regular MT SMS'): match
DDB NOTICE test_db_sms_get('Complete TP-UD (160 septets, 7-bit encoding)'): success, as expected
DDB NOTICE verify_sms('Complete TP-UD (160 septets, 7-bit encoding)'): TP-User-Data mismatch
DDB NOTICE test_db_sms_get('Complete TP-UD (140 octets, 8-bit encoding)'): success, as expected
DDB NOTICE verify_sms('Complete TP-UD (140 octets, 8-bit encoding)'): TP-User-Data mismatch
DDB NOTICE test_db_sms_get('TP-UD buffer overflow (UDH-Length > UD-Length)'): success, as expected
DDB NOTICE verify_sms('TP-UD buffer overflow (UDH-Length > UD-Length)'): match
DDB NOTICE test_db_sms_get('Truncated TP-UD (200 septets, 7-bit encoding)'): success, as expected
DDB NOTICE verify_sms('Truncated TP-UD (200 septets, 7-bit encoding)'): TP-User-Data mismatch
DDB NOTICE test_db_sms_get('Truncated TP-UD (255 octets, 8-bit encoding)'): success, as expected
DDB NOTICE verify_sms('Truncated TP-UD (255 octets, 8-bit encoding)'): TP-User-Data mismatch
DDB NOTICE test_db_sms_get('Same MSISDN #1'): success, as expected
DDB NOTICE verify_sms('Same MSISDN #1'): match
DDB NOTICE test_db_sms_get('Same MSISDN #2'): success, as expected
DDB NOTICE verify_sms('Same MSISDN #2'): match
DDB NOTICE test_db_sms_get('Expired SMS'): success, as expected
DDB NOTICE verify_sms('Expired SMS'): match
DDB NOTICE test_db_sms_get('Empty TP-UD'): success, as expected
DDB NOTICE verify_sms('Empty TP-UD'): match
DDB INFO Testing db_sms_get_next_unsent() and db_sms_mark_delivered()...
DDB NOTICE db_sms_get_next_unsent(#1): found
DDB NOTICE verify_sms('Regular MO SMS'): match
DDB NOTICE db_sms_get_next_unsent(#2): found
DDB NOTICE verify_sms('Regular MT SMS'): match
DDB DEBUG Marking #1 as delivered: rc=0
DDB DEBUG Marking #2 as delivered: rc=0
DDB NOTICE db_sms_get_next_unsent(starting from #1): found
DDB NOTICE verify_sms('Complete TP-UD (160 septets, 7-bit encoding)'): TP-User-Data mismatch
DDB INFO Testing db_sms_delete_sent_message_by_id()...
DDB NOTICE db_sms_delete_sent_message_by_id(#1, sent): rc=0
DDB NOTICE db_sms_delete_sent_message_by_id(#3, not sent): rc=0
DDB INFO Testing db_sms_delete_by_msisdn()...
DDB NOTICE db_sms_delete_by_msisdn('72631'): rc=0
DDB INFO Testing db_sms_delete_oldest_expired_message()...
DDB NOTICE db_sms_delete_oldest_expired_message()
DDB INFO Expectations updated, retrieving all messages again
DDB INFO Testing db_sms_get()...
DDB NOTICE test_db_sms_get('Regular MO SMS'): failure, as expected
DDB NOTICE test_db_sms_get('Regular MT SMS'): success, as expected
DDB NOTICE verify_sms('Regular MT SMS'): match
DDB NOTICE test_db_sms_get('Complete TP-UD (160 septets, 7-bit encoding)'): success, as expected
DDB NOTICE verify_sms('Complete TP-UD (160 septets, 7-bit encoding)'): TP-User-Data mismatch
DDB NOTICE test_db_sms_get('Complete TP-UD (140 octets, 8-bit encoding)'): success, as expected
DDB NOTICE verify_sms('Complete TP-UD (140 octets, 8-bit encoding)'): TP-User-Data mismatch
DDB NOTICE test_db_sms_get('TP-UD buffer overflow (UDH-Length > UD-Length)'): success, as expected
DDB NOTICE verify_sms('TP-UD buffer overflow (UDH-Length > UD-Length)'): match
DDB NOTICE test_db_sms_get('Truncated TP-UD (200 septets, 7-bit encoding)'): success, as expected
DDB NOTICE verify_sms('Truncated TP-UD (200 septets, 7-bit encoding)'): TP-User-Data mismatch
DDB NOTICE test_db_sms_get('Truncated TP-UD (255 octets, 8-bit encoding)'): success, as expected
DDB NOTICE verify_sms('Truncated TP-UD (255 octets, 8-bit encoding)'): TP-User-Data mismatch
DDB NOTICE test_db_sms_get('Same MSISDN #1'): failure, as expected
DDB NOTICE test_db_sms_get('Same MSISDN #2'): failure, as expected
DDB NOTICE test_db_sms_get('Expired SMS'): unexpected result
DDB NOTICE verify_sms('Expired SMS'): match
DDB NOTICE test_db_sms_get('Empty TP-UD'): success, as expected
DDB NOTICE verify_sms('Empty TP-UD'): match
full talloc report on 'null_context' (total 0 bytes in 1 blocks)

3
tests/testsuite.at
View File

@ -20,7 +20,8 @@ AT_SETUP([db_sms_test])
AT_KEYWORDS([db_sms_test])
cat $abs_srcdir/db_sms/db_sms_test.ok > expout
cat $abs_srcdir/db_sms/db_sms_test.err > experr
AT_CHECK([$abs_top_builddir/tests/db_sms/db_sms_test], [], [expout], [experr])
# swap the output from stderr and stdout so we can drop libdbi prints to stderr when trying to load wrong drivers
AT_CHECK([$abs_top_builddir/tests/db_sms/db_sms_test 3>&1 1>&2 2>&3 | grep -v "Failed to load driver" | grep -v "cannot open shared object file"], [], [expout], [experr])
AT_CLEANUP
AT_SETUP([msc_vlr_test_no_authen])