[PATCH] Modified openbsc tests to not ignore stderr

The mgcp, bsc-nat, and abis tests are now rather fragile. It's probably worth checking that everything in their .err files should actually be there and is expected. --- openbsc/tests/abis/abis_test.err | 13 +++++++++++++ openbsc/tests/bsc-nat/bsc_nat_test.err | 6 ++++++ openbsc/tests/mgcp/mgcp_test.err | 25 +++++++++++++++++++++++++ openbsc/tests/testsuite.at | 24 ++++++++++++++++-------- 4 files changed, 60 insertions(+), 8 deletions(-) create mode 100644 openbsc/tests/abis/abis_test.err create mode 100644 openbsc/tests/bsc-nat/bsc_nat_test.err create mode 100644 openbsc/tests/mgcp/mgcp_test.err diff --git a/openbsc/tests/abis/abis_test.err b/openbsc/tests/abis/abis_test.err new file mode 100644 index 0000000..56a86f3 --- /dev/null +++ b/openbsc/tests/abis/abis_test.err @@ -0,0 +1,13 @@ +<0005> abis_nm.c:410 FILE_VERSION attribute identifier not found! +<0005> abis_nm.c:410 FILE_VERSION attribute identifier not found! +<0005> abis_nm.c:410 FILE_VERSION attribute identifier not found! +<0005> abis_nm.c:410 FILE_VERSION attribute identifier not found! +<0005> abis_nm.c:410 FILE_VERSION attribute identifier not found! +<0005> abis_nm.c:410 FILE_VERSION attribute identifier not found! +<0005> abis_nm.c:398 FILE_ID attribute identifier not found! +<0005> abis_nm.c:398 FILE_ID attribute identifier not found! +<0005> abis_nm.c:398 FILE_ID attribute identifier not found! +<0005> abis_nm.c:398 FILE_ID attribute identifier not found! +<0005> abis_nm.c:398 FILE_ID attribute identifier not found! +<0005> abis_nm.c:398 FILE_ID attribute identifier not found! + \ No newline at end of file diff --git a/openbsc/tests/bsc-nat/bsc_nat_test.err b/openbsc/tests/bsc-nat/bsc_nat_test.err new file mode 100644 index 0000000..2ba39cb --- /dev/null +++ b/openbsc/tests/bsc-nat/bsc_nat_test.err @@ -0,0 +1,6 @@ +<000b> ../../src/osmo-bsc_nat/bsc_mgcp_utils.c:317 Failed to find the connection. +<0014> ../../src/osmo-bsc_nat/bsc_nat_filter.c:189 Filtering 244052130421059 by nat imsi_deny on bsc nr: 0. +<0014> ../../src/osmo-bsc_nat/bsc_nat_filter.c:189 Filtering 244052130421059 by nat imsi_deny on bsc nr: 0. +<0014> ../../src/osmo-bsc_nat/bsc_nat_filter.c:178 Filtering 244052130421059 by imsi_deny on bsc nr: 0. +<0014> ../../src/osmo-bsc_nat/bsc_nat_filter.c:78 Duplicate entry for IMSI(12123124) +full talloc report on 'sccp' (total 1 bytes in 1 blocks) diff --git a/openbsc/tests/mgcp/mgcp_test.err b/openbsc/tests/mgcp/mgcp_test.err new file mode 100644 index 0000000..3ce9a3c --- /dev/null +++ b/openbsc/tests/mgcp/mgcp_test.err @@ -0,0 +1,25 @@ +<000b> mgcp_protocol.c:354 Unable to find Endpoint `ds/e1-2/1(a)172.16.6.66&#39; +<000b> mgcp_protocol.c:354 Unable to find Endpoint `ds/e1-3/1(a)172.16.6.66&#39; +<000b> mgcp_protocol.c:645 Endpoint is not holding a connection. 0x2 +<000b> mgcp_protocol.c:537 Unhandled option: 'v'/118 on 0x1 +<000b> mgcp_protocol.c:537 Unhandled option: 'c'/99 on 0x1 +<000b> mgcp_protocol.c:537 Unhandled option: 'm'/109 on 0x1 +<000b> mgcp_protocol.c:537 Unhandled option: 'a'/97 on 0x1 +<000b> mgcp_protocol.c:537 Unhandled option: 'v'/118 on 0x1 +<000b> mgcp_protocol.c:537 Unhandled option: 'c'/99 on 0x1 +<000b> mgcp_protocol.c:537 Unhandled option: 'm'/109 on 0x1 +<000b> mgcp_protocol.c:537 Unhandled option: 'a'/97 on 0x1 +<000b> mgcp_protocol.c:228 msg too short: 2 +<000b> mgcp_protocol.c:377 MGCP status line too short. +<000b> mgcp_protocol.c:377 MGCP status line too short. +<000b> mgcp_protocol.c:377 MGCP status line too short. +<000b> mgcp_protocol.c:377 MGCP status line too short. +<000b> mgcp_protocol.c:537 Unhandled option: 'v'/118 on 0x1 +<000b> mgcp_protocol.c:537 Unhandled option: 'c'/99 on 0x1 +<000b> mgcp_protocol.c:537 Unhandled option: 'm'/109 on 0x1 +<000b> mgcp_protocol.c:537 Unhandled option: 'a'/97 on 0x1 +<000b> mgcp_protocol.c:537 Unhandled option: 'v'/118 on 0x1 +<000b> mgcp_protocol.c:537 Unhandled option: 'c'/99 on 0x1 +<000b> mgcp_protocol.c:537 Unhandled option: 'm'/109 on 0x1 +<000b> mgcp_protocol.c:537 Unhandled option: 'a'/97 on 0x1 + \ No newline at end of file diff --git a/openbsc/tests/testsuite.at b/openbsc/tests/testsuite.at index e649f03..b5b972e 100644 --- a/openbsc/tests/testsuite.at +++ b/openbsc/tests/testsuite.at @@ -4,31 +4,36 @@ AT_BANNER([Regression tests.]) AT_SETUP([gsm0408]) AT_KEYWORDS([gsm0408]) cat $abs_srcdir/gsm0408/gsm0408_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/gsm0408/gsm0408_test], [], [expout], [ignore]) +cat $abs_srcdir/gsm0408/gsm0408_test.err > experr +AT_CHECK([$abs_top_builddir/tests/gsm0408/gsm0408_test], [], [expout], [experr]) AT_CLEANUP AT_SETUP([db]) AT_KEYWORDS([db]) cat $abs_srcdir/db/db_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/db/db_test], [], [expout], [ignore]) +cat $abs_srcdir/db/db_test.err > experr +AT_CHECK([$abs_top_builddir/tests/db/db_test], [], [expout], [experr]) AT_CLEANUP AT_SETUP([channel]) AT_KEYWORDS([channel]) cat $abs_srcdir/channel/channel_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/channel/channel_test], [], [expout], [ignore]) +cat $abs_srcdir/channel/channel_test.err > experr +AT_CHECK([$abs_top_builddir/tests/channel/channel_test], [], [expout], [experr]) AT_CLEANUP AT_SETUP([mgcp]) AT_KEYWORDS([mgcp]) cat $abs_srcdir/mgcp/mgcp_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/mgcp/mgcp_test], [], [expout], [ignore]) +cat $abs_srcdir/mgcp/mgcp_test.err > experr +AT_CHECK([$abs_top_builddir/tests/mgcp/mgcp_test], [], [expout], [experr]) AT_CLEANUP AT_SETUP([gprs]) AT_KEYWORDS([gprs]) cat $abs_srcdir/gprs/gprs_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/gprs/gprs_test], [], [expout], [ignore]) +cat $abs_srcdir/gprs/gprs_test.err > experr +AT_CHECK([$abs_top_builddir/tests/gprs/gprs_test], [], [expout], [experr]) AT_CLEANUP AT_SETUP([bsc-nat]) @@ -37,17 +42,20 @@ AT_CHECK([test "$enable_nat_test" != no || exit 77]) cp $abs_srcdir/bsc-nat/barr.cfg . cp $abs_srcdir/bsc-nat/barr_dup.cfg . cat $abs_srcdir/bsc-nat/bsc_nat_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/bsc-nat/bsc_nat_test], [], [expout], [ignore]) +cat $abs_srcdir/bsc-nat/bsc_nat_test.err > experr +AT_CHECK([$abs_top_builddir/tests/bsc-nat/bsc_nat_test], [], [expout], [experr]) AT_CLEANUP AT_SETUP([si]) AT_KEYWORDS([si]) cat $abs_srcdir/si/si_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/si/si_test], [], [expout], [ignore]) +cat $abs_srcdir/si/si_test.err > experr +AT_CHECK([$abs_top_builddir/tests/si/si_test], [], [expout], [experr]) AT_CLEANUP AT_SETUP([abis]) AT_KEYWORDS([abis]) cat $abs_srcdir/abis/abis_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/abis/abis_test], [], [expout], [ignore]) +cat $abs_srcdir/abis/abis_test.err > experr +AT_CHECK([$abs_top_builddir/tests/abis/abis_test], [], [expout], [experr]) AT_CLEANUP -- 1.8.1.4